We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 70bb498 commit b2248d2Copy full SHA for b2248d2
templates/repo/issue/view_content/pull.tmpl
@@ -455,6 +455,15 @@
455
{{end}}
456
{{end}}{{/* end if: pull request status */}}
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
+ */}}
467
{{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
468
<div class="ui divider"></div>
469
<div class="ui form">
0 commit comments