File tree Expand file tree Collapse file tree 1 file changed +9
-0
lines changed
templates/repo/issue/view_content Expand file tree Collapse file tree 1 file changed +9
-0
lines changed Original file line number Diff line number Diff line change 455
455
{{end}}
456
456
{{end}}{{/* end if: pull request status */}}
457
457
458
+ {{/*
459
+ Manually Merged is not a well-known feature, it helps repo admins to mark a non-mergeable PR (already merged, conflicted) as merged
460
+ To test it:
461
+ * Enable "Manually Merged" feature in the Repository Settings
462
+ * Create a pull request, either:
463
+ * - Merge the pull request branch locally and push the merged commit to Gitea
464
+ * - Make some conflicts between the base branch and the pull request branch
465
+ * Then the Manually Merged form will be shown to repo admin users
466
+ */}}
458
467
{{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
459
468
<div class="ui divider"></div>
460
469
<div class="ui form">
You can’t perform that action at this time.
0 commit comments