Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add comments for Manually Merged feature #24291

Merged
merged 3 commits into from
Apr 23, 2023
Merged

Add comments for Manually Merged feature #24291

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7a573c
add comments for Manually Merged feature
wxiaoguang Apr 23, 2023
58a061f
Merge branch 'main' into fix-comment
silverwind Apr 23, 2023
d872e9d
Merge branch 'main' into fix-comment
GiteaBot Apr 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions templates/repo/issue/view_content/pull.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down