From 48d7a20fb72b59fa60adf6dda305c6db2940e7c1 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sun, 27 Jun 2021 02:40:17 +0900
Subject: [PATCH] Keep default merge strategy selection (#2804)

---
 .../twirl/gitbucket/core/settings/options.scala.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/settings/options.scala.html b/src/main/twirl/gitbucket/core/settings/options.scala.html
index 3373f902f..504b6158a 100644
--- a/src/main/twirl/gitbucket/core/settings/options.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/options.scala.html
@@ -138,11 +138,13 @@
               }
               <fieldset class="form-group">
                 <label for="defaultMergeOption">Default merge strategy</label>
-                <select name="defaultMergeOption" id="defaultMergeOption">
-                  <option value="merge-commit">Merge commit</option>
-                  <option value="squash">Squash</option>
-                  <option value="rebase">Rebase</option>
-                </select>
+                @defining(repository.repository.options.defaultMergeOption) { defaultMergeOption =>
+                  <select name="defaultMergeOption" id="defaultMergeOption">
+                    <option value="merge-commit" @if(defaultMergeOption == "merge-commit"){selected}>Merge commit</option>
+                    <option value="squash" @if(defaultMergeOption == "squash"){selected}>Squash</option>
+                    <option value="rebase" @if(defaultMergeOption == "rebase"){selected}>Rebase</option>
+                  </select>
+                }
                 <span id="error-defaultMergeOption" class="error"></span>
               </fieldset>
             </fieldset>