summaryrefslogtreecommitdiffstats
path: root/templates/repo/settings/options.tmpl
diff options
context:
space:
mode:
authorJulian <julian.toelle97@gmail.com>2018-12-27 11:27:08 +0100
committerLauris BH <lauris@nix.lv>2018-12-27 12:27:08 +0200
commit4a685f8b872a3d4c101c5e8165fa99e696c8fb45 (patch)
tree7ad36ee9bf87cec61ee0967a50037d9331d2ab58 /templates/repo/settings/options.tmpl
parent58bdff53cd98e33791f91584d02887864aabc5c4 (diff)
downloadgitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.tar.gz
gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.zip
Add rebase with merge commit merge style (#3844) (#4052)
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
Diffstat (limited to 'templates/repo/settings/options.tmpl')
-rw-r--r--templates/repo/settings/options.tmpl6
1 files changed, 6 insertions, 0 deletions
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 7994260f6e..738cae4971 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -229,6 +229,12 @@
</div>
<div class="field">
<div class="ui checkbox">
+ <input name="pulls_allow_rebase_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseMerge)}}checked{{end}}>
+ <label>{{.i18n.Tr "repo.settings.pulls.allow_rebase_merge_commit"}}</label>
+ </div>
+ </div>
+ <div class="field">
+ <div class="ui checkbox">
<input name="pulls_allow_squash" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowSquash)}}checked{{end}}>
<label>{{.i18n.Tr "repo.settings.pulls.allow_squash_commits"}}</label>
</div>