tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-28 13:18:37 +00:00
Code Releases Activity

Add rebase with merge commit merge style (#3844) (#4052)

Browse Source 
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
This commit is contained in:
Julian
2018-12-27 11:27:08 +01:00
committed by Lauris BH
parent 58bdff53cd
commit 4a685f8b87
14 changed files with 162 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/repo/settings/options.tmpl
View File

@@ -227,6 +227,12 @@
<label>{{.i18n.Tr "repo.settings.pulls.allow_rebase_merge"}}</label>
</div>
</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}}>