diff options
Diffstat (limited to 'templates/repo/settings/options.tmpl')
| -rw-r--r-- | templates/repo/settings/options.tmpl | 6 |
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> |