diff options
| author | Tim <tim@datenknoten.me> | 2024-10-23 06:39:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-23 12:39:43 +0800 |
| commit | de2ad2e1b177ed1c3412761c54b28579f8ecbb00 (patch) | |
| tree | a8124fa2c61116adfe96e41b89335202c2955b55 /templates/repo | |
| parent | 620f19610ef747412a9e4265c6b20fa560663f17 (diff) | |
| download | gitea-de2ad2e1b177ed1c3412761c54b28579f8ecbb00.tar.gz gitea-de2ad2e1b177ed1c3412761c54b28579f8ecbb00.zip | |
Make admins adhere to branch protection rules (#32248)
This introduces a new flag `BlockAdminMergeOverride` on the branch
protection rules that prevents admins/repo owners from bypassing branch
protection rules and merging without approvals or failing status checks.
Fixes #17131
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Giteabot <teabot@gitea.io>
Diffstat (limited to 'templates/repo')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/settings/protected_branch.tmpl | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 1ce658ed00..5353357e81 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -164,7 +164,7 @@ {{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOfficialReviewRequests .IsBlockedByOutdatedBranch .IsBlockedByChangedProtectedFiles (and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess))}} {{/* admin can merge without checks, writer can merge when checks succeed */}} - {{$canMergeNow := and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}} + {{$canMergeNow := and (or (and (not $.ProtectedBranch.BlockAdminMergeOverride) $.IsRepoAdmin) (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}} {{/* admin and writer both can make an auto merge schedule */}} {{if $canMergeNow}} diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index 6fab4a625a..61cc6077a1 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -323,6 +323,13 @@ <p class="help">{{ctx.Locale.Tr "repo.settings.block_outdated_branch_desc"}}</p> </div> </div> + <div class="field"> + <div class="ui checkbox"> + <input name="block_admin_merge_override" type="checkbox" {{if .Rule.BlockAdminMergeOverride}}checked{{end}}> + <label>{{ctx.Locale.Tr "repo.settings.block_admin_merge_override"}}</label> + <p class="help">{{ctx.Locale.Tr "repo.settings.block_admin_merge_override_desc"}}</p> + </div> + </div> <div class="divider"></div> <div class="field"> |