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

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

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

1
routers/web/repo/setting.go
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),
},