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

make the merge style preselection depend on which style is preferred in the frontend

pull/7919/head
Gogs 2025-02-23 21:53:18 +01:00
parent 08375a1b98
commit eb26b21216
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,7 +198,7 @@
{{if .Issue.Repo.PullsAllowMerge}}
<div class="field">
<div class="ui radio checkbox">
<input type="radio" name="merge_style" value="create_merge_commit" checked="checked">
<input type="radio" name="merge_style" value="create_merge_commit" {{if not .Issue.Repo.PullsPreferRebase}}checked="checked"{{end}}>
<label>{{$.i18n.Tr "repo.pulls.create_merge_commit"}}</label>
</div>
</div>
@ -206,7 +206,7 @@
{{if .Issue.Repo.PullsAllowRebase}}
<div class="field">
<div class="ui radio checkbox">
<input type="radio" name="merge_style" value="rebase_before_merging">
<input type="radio" name="merge_style" value="rebase_before_merging" {{if .Issue.Repo.PullsPreferRebase}}checked="checked"{{end}}>
<label>{{$.i18n.Tr "repo.pulls.rebase_before_merging"}}</label>
</div>
</div>