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

fix calReleaseNumCommitsBehind (#24148) #24197

Merged
merged 15 commits into from Apr 22, 2023

Conversation

oliverpool
Copy link
Contributor

Backport #24148

repoCtx.CommitsCount is not reliably the commit count of the default branch (Repository.GetCommitsCount depends on what is currently displayed).

contributed in the context of @forgejo

Backport go-gitea#24148

`repoCtx.CommitsCount` is not reliably the commit count of the default
branch (Repository.GetCommitsCount depends on what is currently
displayed).

_contributed in the context of @forgejo_

---------

Co-authored-by: Giteabot <teabot@gitea.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@oliverpool
Copy link
Contributor Author

There were merge conflicts in the test cases, which I manually resolved (I could also drop them all if you prefer).

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 18, 2023
@lunny lunny added this to the 1.19.2 milestone Apr 19, 2023
@lunny lunny added the type/bug label Apr 19, 2023
@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 Apr 20, 2023
@yardenshoham
Copy link
Member

Gonna do a quick label test here

@yardenshoham yardenshoham added the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Apr 21, 2023
@GiteaBot GiteaBot removed the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Apr 21, 2023
@yardenshoham
Copy link
Member

Ok done

@yardenshoham yardenshoham added the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Apr 22, 2023
@GiteaBot GiteaBot removed the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Apr 22, 2023
@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 Apr 22, 2023
@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 22, 2023
@pull-request-size pull-request-size bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Apr 22, 2023
@silverwind silverwind enabled auto-merge (squash) April 22, 2023 15:14
@silverwind silverwind merged commit 077160b into go-gitea:release/v1.19 Apr 22, 2023
2 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 22, 2023
@oliverpool oliverpool deleted the backport-24148-v1.19 branch April 23, 2023 08:56
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants