diff options
| author | Jimmy Praet <jimmy.praet@telenet.be> | 2022-03-04 09:30:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 03:30:49 -0500 |
| commit | 5184c83f6b702aeec3ea85263e16ccf5ebe89836 (patch) | |
| tree | d5a5f04630815a7342c6e26409faeac75620573b /templates/repo/settings | |
| parent | 3c7201682cde10ed551476e13e9e1bfdd971e0c0 (diff) | |
| download | gitea-5184c83f6b702aeec3ea85263e16ccf5ebe89836.tar.gz gitea-5184c83f6b702aeec3ea85263e16ccf5ebe89836.zip | |
Add config option to disable "Update branch by rebase" (#18745)
Diffstat (limited to 'templates/repo/settings')
| -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 adcb6dd3df..7695345010 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -450,6 +450,12 @@ </div> <div class="field"> <div class="ui checkbox"> + <input name="pulls_allow_rebase_update" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseUpdate)}}checked{{end}}> + <label>{{.i18n.Tr "repo.settings.pulls.allow_rebase_update"}}</label> + </div> + </div> + <div class="field"> + <div class="ui checkbox"> <input name="default_delete_branch_after_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge)}}checked{{end}}> <label>{{.i18n.Tr "repo.settings.pulls.default_delete_branch_after_merge"}}</label> </div> |