diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-24 03:48:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-23 15:48:51 -0400 |
| commit | b2248d25534029d4292c126fdde94bc8f84ea2c1 (patch) | |
| tree | 4d60d103d6c4ae9ea83fefd9ba23ce86fcb3f705 /templates/repo/issue | |
| parent | 70bb4984cdad9a15d676708bd345b590aa42d72a (diff) | |
| download | gitea-b2248d25534029d4292c126fdde94bc8f84ea2c1.tar.gz gitea-b2248d25534029d4292c126fdde94bc8f84ea2c1.zip | |
Add comments for Manually Merged feature (#24291)
In case I would forget it again one day .....
Diffstat (limited to 'templates/repo/issue')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 899867ce72..5e405c9d2c 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -455,6 +455,15 @@ {{end}} {{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 + 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 + */}} {{if and $.StillCanManualMerge (not $showGeneralMergeForm)}} <div class="ui divider"></div> <div class="ui form"> |