Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-14 17:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Keep default merge strategy selection (#2804)

Browse Source
This commit is contained in:
Naoki Takezoe
2021-06-27 02:40:17 +09:00
committed by GitHub
parent 04108a0a1a
commit 48d7a20fb7
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/twirl/gitbucket/core/settings/options.scala.html
View File

@@ -138,11 +138,13 @@
} }
<fieldset class="form-group"> <fieldset class="form-group">
<label for="defaultMergeOption">Default merge strategy</label> <label for="defaultMergeOption">Default merge strategy</label>
<select name="defaultMergeOption" id="defaultMergeOption"> @defining(repository.repository.options.defaultMergeOption) { defaultMergeOption =>
<option value="merge-commit">Merge commit</option> <select name="defaultMergeOption" id="defaultMergeOption">
<option value="squash">Squash</option> <option value="merge-commit" @if(defaultMergeOption == "merge-commit"){selected}>Merge commit</option>
<option value="rebase">Rebase</option> <option value="squash" @if(defaultMergeOption == "squash"){selected}>Squash</option>
</select> <option value="rebase" @if(defaultMergeOption == "rebase"){selected}>Rebase</option>
</select>
}
<span id="error-defaultMergeOption" class="error"></span> <span id="error-defaultMergeOption" class="error"></span>
</fieldset> </fieldset>
</fieldset> </fieldset>