Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-05 12:29:05 +02:00
Code Issues Activity

Add config option to disable "Update branch by rebase" (#18745)

Browse Source
This commit is contained in:
Jimmy Praet authored and GitHub committed 2022-03-04 03:30:49 -05:00
1 parent 3c7201682c
commit 5184c83f6b
10 files changed
+31 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

routers/web/repo/setting.go
+1
View File
@@ -472,6 +472,7 @@ func SettingsPost(ctx *context.Context) {
AllowSquash: form.PullsAllowSquash,
AllowManualMerge: form.PullsAllowManualMerge,
AutodetectManualMerge: form.EnableAutodetectManualMerge,
AllowRebaseUpdate: form.PullsAllowRebaseUpdate,
DefaultDeleteBranchAfterMerge: form.DefaultDeleteBranchAfterMerge,
DefaultMergeStyle: repo_model.MergeStyle(form.PullsDefaultMergeStyle),
},