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

Fix the approval count of PR when there is no protection branch rule #27272

Merged
merged 7 commits into from
Sep 28, 2023
Merged

Fix the approval count of PR when there is no protection branch rule #27272

merged 7 commits into from
Sep 28, 2023

Conversation

lng2020
Copy link
Member

@lng2020 lng2020 commented Sep 26, 2023

As title
ksnip_20230926-115158

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 26, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 26, 2023
@silverwind silverwind added the backport/v1.21 This PR should be backported to Gitea 1.21 label Sep 26, 2023
@silverwind
Copy link
Member

Fixes #27208?

@lng2020
Copy link
Member Author

lng2020 commented Sep 26, 2023 •
edited

Fixes #27208?

I don't think so. The official field in table review involves many repo settings and I'm not sure about the root reason.

lunny
lunny reviewed Sep 27, 2023
View reviewed changes
models/issues/review.go Outdated Show resolved Hide resolved
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 27, 2023
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 27, 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 Sep 27, 2023
@lunny lunny added the type/bug label Sep 27, 2023
@lunny lunny added this to the 1.22.0 milestone Sep 28, 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 Sep 28, 2023
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 28, 2023
@silverwind silverwind enabled auto-merge (squash) September 28, 2023 22:57
@silverwind silverwind merged commit 15a504c into go-gitea:main Sep 28, 2023
26 checks passed
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 28, 2023
@lng2020 @GiteaBot
Fix the approval count of PR when there is no protection branch rule (g…
5650360 
…o-gitea#27272)

As title

![ksnip_20230926-115158](https://github.com/go-gitea/gitea/assets/70063547/a60be44a-06ad-421e-ba27-e4e0adfa5db7)
@GiteaBot GiteaBot mentioned this pull request Sep 28, 2023
Merged
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Sep 28, 2023
silverwind pushed a commit that referenced this pull request Sep 29, 2023
@GiteaBot @lng2020
Fix the approval count of PR when there is no protection branch rule (#…
c61b9c5 
…27272) (#27343)

Backport #27272 by @lng2020

As title

![ksnip_20230926-115158](https://github.com/go-gitea/gitea/assets/70063547/a60be44a-06ad-421e-ba27-e4e0adfa5db7)

Co-authored-by: Nanguan Lin <[email protected]>
@lng2020 lng2020 deleted the fix/approval_count branch October 11, 2023 09:54
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 28, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lng2020 @silverwind @lunny @GiteaBot