From eb26b2121694eab4bfc64c65c85a1cdc7745b5c2 Mon Sep 17 00:00:00 2001
From: Gogs <gogs@fake.local>
Date: Sun, 23 Feb 2025 21:53:18 +0100
Subject: [PATCH] make the merge style preselection depend on which style is
 preferred in the frontend

---
 templates/repo/issue/view_content.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 46dc979ff..33a3eae38 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -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>