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.

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

Show number of commits a branch is ahead or behind the default branch #5339

Conversation

adelowo
Copy link
Member

@adelowo adelowo commented Nov 15, 2018

Fixes #5326

This uses a flash message to display "if ahead, behind or equal with the default branch".

screenshot 2018-11-16 at 00 14 59

@adelowo
Copy link
Member Author

adelowo commented Nov 15, 2018

We obviously can improve it by adding it to the UI
but frontend is not my strength and will appreciate any help if someone has a prototype
of what it is supposed to look like

@bkcsoft bkcsoft added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 15, 2018
@adelowo adelowo changed the title Show number of commits a branch is ahead or behind default Show number of commits a branch is ahead or behind the default branch Nov 15, 2018
@codecov-io
Copy link

codecov-io commented Nov 15, 2018

Codecov Report

Merging #5339 into master will increase coverage by 0.01%.
The diff coverage is 73.07%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5339      +/-   ##
==========================================
+ Coverage   41.44%   41.45%   +0.01%     
==========================================
  Files         441      441              
  Lines       59696    59722      +26     
==========================================
+ Hits        24739    24759      +20     
- Misses      31732    31736       +4     
- Partials     3225     3227       +2
Impacted Files Coverage Δ
routers/repo/view.go 44.89% <73.07%> (+1.85%) ⬆️
models/repo_list.go 72.08% <0%> (-1.02%) ⬇️
modules/log/event.go 65.98% <0%> (+1.52%) ⬆️

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 8de76b6...ae26ae2. Read the comment docs.

routers/repo/view.go Outdated Show resolved Hide resolved
@techknowlogick
Copy link
Member

@adelowo are you able to provide screenshots?

@techknowlogick techknowlogick added type/feature Completely new functionality. Can only be merged if feature freeze is not active. topic/ui Change the appearance of the Gitea UI labels Nov 15, 2018
@techknowlogick techknowlogick added this to the 1.7.0 milestone Nov 15, 2018
@adelowo
Copy link
Member Author

adelowo commented Nov 15, 2018

Sure @techknowlogick .. I updated the initial post

@techknowlogick techknowlogick modified the milestones: 1.7.0, 1.8.0 Dec 19, 2018
@stale
Copy link

stale bot commented Feb 17, 2019

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 months. Thank you for your contributions.

@stale stale bot added issue/stale and removed issue/stale labels Feb 17, 2019
@techknowlogick techknowlogick modified the milestones: 1.8.0, 1.9.0 Feb 19, 2019
@stale
Copy link

stale bot commented Apr 20, 2019

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 months. Thank you for your contributions.

@adelowo
Copy link
Member Author

adelowo commented Apr 21, 2019

#6695 has a better fix by putting that into a reusable function.

Once it is merged, will update this PR :)

@adelowo adelowo force-pushed the show_commit_diffs_btw_current_branch_and_master branch from ad8f303 to 38e2fc1 Compare May 5, 2019 16:45
@techknowlogick techknowlogick modified the milestones: 1.9.0, 1.10.0 Jun 4, 2019
@lunny
Copy link
Member

lunny commented Jul 7, 2019

image
I think maybe we should add both behind and before?

@techknowlogick techknowlogick modified the milestones: 1.10.0, 1.11.0 Sep 3, 2019
@stale
Copy link

stale bot commented Nov 2, 2019

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 months. Thank you for your contributions.

@stale stale bot added the issue/stale label Nov 2, 2019
@lunny lunny added the issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented label Nov 2, 2019
@stale stale bot removed the issue/stale label Nov 2, 2019
@adelowo
Copy link
Member Author

adelowo commented Nov 2, 2019

Can this be reviewed again?

@techknowlogick techknowlogick modified the milestones: 1.11.0, 1.x.x Dec 30, 2019
@6543
Copy link
Member

6543 commented Apr 6, 2020

I would not use the Flash message

instead add it to the page some how.

github do it this way:
Screenshot at 2020-04-06 22-12-36

We may find a eaven better solution

@codecov-commenter
Copy link

Codecov Report

Merging #5339 into master will decrease coverage by 0.79%.
The diff coverage is 73.07%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5339      +/-   ##
==========================================
- Coverage   42.25%   41.45%   -0.80%     
==========================================
  Files         590      441     -149     
  Lines       78002    59722   -18280     
==========================================
- Hits        32957    24759    -8198     
+ Misses      41003    31736    -9267     
+ Partials     4042     3227     -815     
Impacted Files Coverage Δ
routers/repo/view.go 44.89% <73.07%> (+5.41%) ⬆️
modules/git/signature.go 0.00% <0.00%> (-64.00%) ⬇️
modules/git/tag.go 10.86% <0.00%> (-63.05%) ⬇️
modules/util/path.go 0.00% <0.00%> (-61.54%) ⬇️
routers/api/v1/utils/utils.go 0.00% <0.00%> (-56.00%) ⬇️
modules/repofiles/verification.go 28.57% <0.00%> (-55.64%) ⬇️
modules/context/panic.go 50.00% <0.00%> (-50.00%) ⬇️
routers/api/v1/admin/org.go 0.00% <0.00%> (-46.74%) ⬇️
models/wiki.go 58.87% <0.00%> (-41.13%) ⬇️
modules/notification/base/null.go 22.72% <0.00%> (-39.78%) ⬇️
... and 479 more

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 7a3a90a...2f7c5e0. Read the comment docs.

@codecov-io
Copy link

Codecov Report

Merging #5339 into master will decrease coverage by 0.54%.
The diff coverage is 73.07%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5339      +/-   ##
==========================================
- Coverage   42.00%   41.45%   -0.55%     
==========================================
  Files         683      441     -242     
  Lines       75279    59722   -15557     
==========================================
- Hits        31618    24759    -6859     
+ Misses      38499    31736    -6763     
+ Partials     5162     3227    -1935     
Impacted Files Coverage Δ
routers/repo/view.go 44.89% <73.07%> (+6.77%) ⬆️
routers/api/v1/utils/utils.go 0.00% <0.00%> (-80.00%) ⬇️
modules/git/signature.go 0.00% <0.00%> (-70.00%) ⬇️
modules/git/tag.go 10.86% <0.00%> (-65.33%) ⬇️
modules/util/path.go 0.00% <0.00%> (-63.64%) ⬇️
modules/repofiles/verification.go 28.57% <0.00%> (-58.10%) ⬇️
routers/api/v1/repo/milestone.go 0.00% <0.00%> (-57.70%) ⬇️
routers/api/v1/repo/label.go 0.00% <0.00%> (-56.72%) ⬇️
modules/notification/base/null.go 22.72% <0.00%> (-48.71%) ⬇️
models/repo_branch.go 53.39% <0.00%> (-46.61%) ⬇️
... and 755 more

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 1b07db7...24c2ed1. Read the comment docs.

@lunny lunny removed this from the 1.x.x milestone Feb 1, 2023
@lunny
Copy link
Member

lunny commented Feb 1, 2023

Closed as it's outdated.

@lunny lunny closed this Feb 1, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. topic/ui Change the appearance of the Gitea UI type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show number of commits a branch is ahead or behind default
9 participants