USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make the regular merge option being present conditional in the same way as the rebase merge option in the frontend

pull/7919/head
Gogs 2025-02-23 21:52:11 +01:00
parent 2229c305cb
commit 08375a1b98
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
templates/repo/issue/view_content.tmpl
View File

@ -195,12 +195,14 @@
<div class="ui divider"></div>
<form class="ui form" action="{{.Link}}/merge" method="post">
{{.CSRFTokenHTML}}
<div class="field">
<div class="ui radio checkbox">
<input type="radio" name="merge_style" value="create_merge_commit" checked="checked">
<label>{{$.i18n.Tr "repo.pulls.create_merge_commit"}}</label>
{{if .Issue.Repo.PullsAllowMerge}}
<div class="field">
<div class="ui radio checkbox">
<input type="radio" name="merge_style" value="create_merge_commit" checked="checked">
<label>{{$.i18n.Tr "repo.pulls.create_merge_commit"}}</label>
</div>
</div>
</div>
{{end}}
{{if .Issue.Repo.PullsAllowRebase}}
<div class="field">
<div class="ui radio checkbox">