diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2023-10-30 04:13:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-30 11:13:06 +0800 |
| commit | 1756e30e102d079f8425aa2061ef80fd36c2e57d (patch) | |
| tree | 54e1faf1a1d2152fedc063f54d0e0759b8106407 /templates/repo/issue | |
| parent | b36e2ca4195298d2e4516e3022b953543f62f470 (diff) | |
| download | gitea-1756e30e102d079f8425aa2061ef80fd36c2e57d.tar.gz gitea-1756e30e102d079f8425aa2061ef80fd36c2e57d.zip | |
Allow pull requests Manually Merged option to be used by non-admins (#27780)
Currently this feature is only available to admins, but there is no
clear reason why. If a user can actually merge pull requests, then this
seems fine as well.
This is useful in situations where direct pushes to the repository are
commonly done by developers.
---------
Co-authored-by: delvh <dev.lh@web.de>
Diffstat (limited to 'templates/repo/issue')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 2fed5848d5..e06404376c 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -263,7 +263,7 @@ }, { 'name': 'manually-merged', - 'allowed': {{and $prUnit.PullRequestsConfig.AllowManualMerge $.IsRepoAdmin}}, + 'allowed': {{$prUnit.PullRequestsConfig.AllowManualMerge}}, 'textDoMerge': {{ctx.Locale.Tr "repo.pulls.merge_manually"}}, 'hideMergeMessageTexts': true, 'hideAutoMerge': true, @@ -349,13 +349,13 @@ {{end}}{{/* end if: pull request status */}} {{/* - Manually Merged is not a well-known feature, it helps repo admins to mark a non-mergeable PR (already merged, conflicted) as merged + Manually Merged is not a well-known feature, it is used to mark a non-mergeable PR (already merged, conflicted) as merged To test it: * Enable "Manually Merged" feature in the Repository Settings * Create a pull request, either: * - Merge the pull request branch locally and push the merged commit to Gitea * - Make some conflicts between the base branch and the pull request branch - * Then the Manually Merged form will be shown to repo admin users + * Then the Manually Merged form will be shown in the merge form */}} {{if and $.StillCanManualMerge (not $showGeneralMergeForm)}} <div class="divider"></div> |