pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add comments for Manually Merged feature (#24291)

Browse source 
In case I would forget it again one day .....
This commit is contained in:
wxiaoguang 2023-04-24 03:48:51 +08:00 committed by GitHub
parent 70bb4984cd
commit b2248d2553
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
templates/repo/issue/view_content/pull.tmpl
View file

@ -455,6 +455,15 @@
{{end}} {{end}}
{{end}}{{/* end if: pull request status */}} {{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)}} {{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="ui form"> <div class="ui form">