diff options
| author | parnic <github@parnic.com> | 2021-03-27 09:55:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-27 15:55:40 +0100 |
| commit | f4d27498bdc615605e14f783501e1d1256cd8d22 (patch) | |
| tree | 8d04695b060bd8bac65b4a0d669628fe220a23e6 /routers/api/v1/repo/repo.go | |
| parent | 6b836ac5f7546bc9ffb118b213dba92d3dd9ba8e (diff) | |
| download | gitea-f4d27498bdc615605e14f783501e1d1256cd8d22.tar.gz gitea-f4d27498bdc615605e14f783501e1d1256cd8d22.zip | |
Add DefaultMergeStyle option to repository (#14789)
Fixes #12293
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 b7ed2951ad..c422feb043 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -731,6 +731,7 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error { AllowSquash: true, AllowManualMerge: true, AutodetectManualMerge: false, + DefaultMergeStyle: models.MergeStyleMerge, } } else { config = unit.PullRequestsConfig() @@ -757,6 +758,9 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error { if opts.AutodetectManualMerge != nil { config.AutodetectManualMerge = *opts.AutodetectManualMerge } + if opts.DefaultMergeStyle != nil { + config.DefaultMergeStyle = models.MergeStyle(*opts.DefaultMergeStyle) + } units = append(units, models.RepoUnit{ RepoID: repo.ID, |