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 /routers/api/v1/repo/repo.go | |
| parent | 3c7201682cde10ed551476e13e9e1bfdd971e0c0 (diff) | |
| download | gitea-5184c83f6b702aeec3ea85263e16ccf5ebe89836.tar.gz gitea-5184c83f6b702aeec3ea85263e16ccf5ebe89836.zip | |
Add config option to disable "Update branch by rebase" (#18745)
Diffstat (limited to 'routers/api/v1/repo/repo.go')
| -rw-r--r-- | routers/api/v1/repo/repo.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 7a7fe218e8..560139c457 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -860,6 +860,7 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error { AllowSquash: true, AllowManualMerge: true, AutodetectManualMerge: false, + AllowRebaseUpdate: true, DefaultDeleteBranchAfterMerge: false, DefaultMergeStyle: repo_model.MergeStyleMerge, } @@ -888,6 +889,9 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error { if opts.AutodetectManualMerge != nil { config.AutodetectManualMerge = *opts.AutodetectManualMerge } + if opts.AllowRebaseUpdate != nil { + config.AllowRebaseUpdate = *opts.AllowRebaseUpdate + } if opts.DefaultDeleteBranchAfterMerge != nil { config.DefaultDeleteBranchAfterMerge = *opts.DefaultDeleteBranchAfterMerge } |