Add block on pending codeowner reviews branch protection #34995
Conversation
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
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
| @@ -47,6 +48,147 @@ func IsCodeOwnerFile(f string) bool { | |||
| return slices.Contains(codeOwnerFiles, f) | |||
| } | |||
|
|
|||
| func HasAllRequiredCodeownerReviews(ctx context.Context, pb *git_model.ProtectedBranch, pr *issues_model.PullRequest) bool { | |||
There was a problem hiding this comment.
A unit test or an integration test is required for this function to ensure its correctness.
There was a problem hiding this comment.
Good point. I went and amended the existing code owner integration test to also check for branch protection rule enforcement.
Naxdy
force-pushed
the
work/codeowner-review
branch
2 times, most recently
from
a66bad2 to
a5035a7
Compare
Naxdy
force-pushed
the
work/codeowner-review
branch
from
a5035a7 to
5df3166
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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