Add block on pending codeowner reviews branch protection#34995
Open
Naxdy wants to merge 2 commits intogo-gitea:mainfrom
Open
Add block on pending codeowner reviews branch protection#34995Naxdy wants to merge 2 commits intogo-gitea:mainfrom
Naxdy wants to merge 2 commits intogo-gitea:mainfrom
Conversation
GiteaBot
added
the
lgtm/need 2
github-actions
bot
added
modifies/translation
modifies/api
Naxdy
force-pushed
the
work/codeowner-review
branch
5 times, most recently
from
7ff6bd4 to
7141ade
Compare
Naxdy
force-pushed
the
work/codeowner-review
branch
2 times, most recently
from
39ba543 to
18cce17
Compare
lunny
reviewed
Jul 11, 2025
Naxdy
force-pushed
the
work/codeowner-review
branch
3 times, most recently
from
a5035a7 to
5df3166
Compare
lunny
reviewed
Jul 14, 2025
|
|
||
| hasApprovals := true | ||
|
|
||
| for _, rule := range rules { |
Member
There was a problem hiding this comment.
The logic appears overly complex and doesn’t seem correct. I ran a test, and it didn’t work as expected. Could you please rewrite it to make it clearer and more readable?
Contributor
Author
There was a problem hiding this comment.
I ran a test, and it didn’t work as expected.
Can you give me more info about that, like the codeowner file you used and what you expected vs. what happened?
Contributor
Author
There was a problem hiding this comment.
Also went and amended it to be a bit more concise. The behavior should be unchanged though, so I'd still be interested in your findings.
Naxdy
force-pushed
the
work/codeowner-review
branch
3 times, most recently
from
b448f2c to
e01ac3d
Compare
Contributor
Author
|
Relevant PR for gitea docs, for if/when this is merged: https://gitea.com/gitea/docs/pulls/245 |
Naxdy
force-pushed
the
work/codeowner-review
branch
2 times, most recently
from
d1f75f3 to
1201827
Compare
Naxdy
force-pushed
the
work/codeowner-review
branch
from
1201827 to
7f9d373
Compare
github-actions
bot
added
modifies/api
lunny
reviewed
Sep 19, 2025
Naxdy
force-pushed
the
work/codeowner-review
branch
2 times, most recently
from
ce73de0 to
e40c846
Compare
Naxdy
force-pushed
the
work/codeowner-review
branch
3 times, most recently
from
a25ec77 to
f8cba0b
Compare
lunny
reviewed
Dec 14, 2025
Naxdy
force-pushed
the
work/codeowner-review
branch
from
f8cba0b to
49f1ed0
Compare
Naxdy
force-pushed
the
work/codeowner-review
branch
4 times, most recently
from
e0e5370 to
186f7c4
Compare
Naxdy
force-pushed
the
work/codeowner-review
branch
from
186f7c4 to
743ded8
Compare
Contributor
Author
|
Been busy for a while, but finally found some time to clean this up. Ready for another review pass by @lunny |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit introduces a new branch protection rule that allows merge blocking if there are pending reviews from one or more code owners (as defined in any valid
CODEOWNERSfile). This is determined by evaluating each rule present in theCODEOWNERSfile individually. For every rule, at least one named code owner (or member of a code owner team) must have given an approving review for merging to be possible.Closes #32602
This PR does NOT display code owners separately from other reviewers (#28137), as I think it makes sense to do that in a separate PR, as it doesn't require any database migrations.
Screenshot
Pull Request
Branch Protection Rule
Unresolved questions
Does this warrant a doc change?Relevant PR: https://gitea.com/gitea/docs/pulls/245