diff options
Diffstat (limited to 'routers/repo/setting.go')
| -rw-r--r-- | routers/repo/setting.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/routers/repo/setting.go b/routers/repo/setting.go index f815171ac5..2bb57a0e47 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -227,6 +227,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { IgnoreWhitespaceConflicts: form.PullsIgnoreWhitespace, AllowMerge: form.PullsAllowMerge, AllowRebase: form.PullsAllowRebase, + AllowRebaseMerge: form.PullsAllowRebaseMerge, AllowSquash: form.PullsAllowSquash, }, }) |