Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Number of commits ahead/behind in branch overview #6695

Merged
merged 12 commits into from
May 5, 2019
Merged

Number of commits ahead/behind in branch overview #6695

merged 12 commits into from
May 5, 2019

Conversation

saitho
Copy link
Contributor

@saitho saitho commented Apr 20, 2019 •
edited
Loading

Resolves #5628.

branch-ahead-behind

Will have to check how that works with forked repositories. And I want to look into also showing the information in branch select fields (mentioned in #5326) Therefore this PR is WIP.

@lafriks lafriks added type/feature Completely new functionality. Can only be merged if feature freeze is not active. pr/wip This PR is not ready for review labels Apr 20, 2019
@lafriks lafriks added this to the 1.9.0 milestone Apr 20, 2019
@adelowo adelowo mentioned this pull request Apr 21, 2019
Closed
@filipnavara filipnavara mentioned this pull request Apr 24, 2019
Merged
@saitho saitho force-pushed the feature/5628-show_commit_divergence branch from 1272725 to a4bc299 Compare April 27, 2019 17:41
@saitho
Adds test for diverging commits
167a531 
Signed-off-by: Mario Lubenka <[email protected]>
@codecov-io
Copy link

codecov-io commented Apr 27, 2019 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@c1da790). Click here to learn what that means.
The diff coverage is 59.57%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #6695   +/-   ##
=========================================
  Coverage          ?   41.17%           
=========================================
  Files             ?      424           
  Lines             ?    58459           
  Branches          ?        0           
=========================================
  Hits              ?    24073           
  Misses            ?    31201           
  Partials          ?     3185
Impacted Files Coverage Δ
modules/templates/helper.go 48.85% <100%> (ø)
modules/git/repo.go 64.17% <47.82%> (ø)
modules/repofiles/commit.go 50% <50%> (ø)
routers/repo/branch.go 56.61% <66.66%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c1da790...3fc722f. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 27, 2019
@saitho
Copy link
Contributor Author

saitho commented Apr 27, 2019

Not sure why the tests fail on DroneCI. I reset my local repository and recreated it from scratch the same way as DroneCI does it. The test work for me, not on CI... :(

@saitho
Removes test as CI can't run it
f7522ad 
Signed-off-by: Mario Lubenka <[email protected]>
@saitho saitho marked this pull request as ready for review April 28, 2019 10:17
@saitho
Copy link
Contributor Author

saitho commented Apr 28, 2019

For now I removed the test I created, as I couldn't figure out what I had to do in order to successfully run it via DroneCI. => Ready for review.

@saitho
Copy link
Contributor Author

saitho commented May 1, 2019

@lafriks Can you remove the WIP flag? ;)

@lafriks lafriks removed the pr/wip This PR is not ready for review label May 1, 2019
sapk
sapk approved these changes May 2, 2019
View reviewed changes
Copy link
Member

@sapk sapk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works great and the PR is simple and effective.
Thanks

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 2, 2019
lunny
lunny requested changes May 4, 2019
View reviewed changes
models/repo.go Outdated Show resolved Hide resolved
@saitho
Copy link
Contributor Author

saitho commented May 4, 2019

@lunny Done :)

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 5, 2019
@lafriks lafriks merged commit 55a8e12 into go-gitea:master May 5, 2019
@lunny lunny added the type/changelog Adds the changelog for a new Gitea version label May 6, 2019
@saitho saitho mentioned this pull request May 19, 2019
Merged
@saitho saitho deleted the feature/5628-show_commit_divergence branch May 25, 2019 21:38
@mrsdizzie mrsdizzie mentioned this pull request Sep 8, 2020
Closed
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
@delvh delvh removed the type/changelog Adds the changelog for a new Gitea version label Oct 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@sapk sapk sapk approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Milestone
1.9.0
Development

Successfully merging this pull request may close these issues.

Show number of commits ahead/behind in branch overview
7 participants
@saitho @codecov-io @lunny @sapk @lafriks @GiteaBot @delvh