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 /models | |
| parent | 3c7201682cde10ed551476e13e9e1bfdd971e0c0 (diff) | |
| download | gitea-5184c83f6b702aeec3ea85263e16ccf5ebe89836.tar.gz gitea-5184c83f6b702aeec3ea85263e16ccf5ebe89836.zip | |
Add config option to disable "Update branch by rebase" (#18745)
Diffstat (limited to 'models')
| -rw-r--r-- | models/repo.go | 2 | ||||
| -rw-r--r-- | models/repo/repo_unit.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/models/repo.go b/models/repo.go index 4b2221e643..6a806b7e25 100644 --- a/models/repo.go +++ b/models/repo.go @@ -521,7 +521,7 @@ func CreateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_ units = append(units, repo_model.RepoUnit{ RepoID: repo.ID, Type: tp, - Config: &repo_model.PullRequestsConfig{AllowMerge: true, AllowRebase: true, AllowRebaseMerge: true, AllowSquash: true, DefaultMergeStyle: repo_model.MergeStyleMerge}, + Config: &repo_model.PullRequestsConfig{AllowMerge: true, AllowRebase: true, AllowRebaseMerge: true, AllowSquash: true, DefaultMergeStyle: repo_model.MergeStyleMerge, AllowRebaseUpdate: true}, }) } else { units = append(units, repo_model.RepoUnit{ diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index f526cbdf8b..37f1c70545 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -115,12 +115,15 @@ type PullRequestsConfig struct { AllowSquash bool AllowManualMerge bool AutodetectManualMerge bool + AllowRebaseUpdate bool DefaultDeleteBranchAfterMerge bool DefaultMergeStyle MergeStyle } // FromDB fills up a PullRequestsConfig from serialized format. func (cfg *PullRequestsConfig) FromDB(bs []byte) error { + // AllowRebaseUpdate = true as default for existing PullRequestConfig in DB + cfg.AllowRebaseUpdate = true return json.UnmarshalHandleDoubleEncode(bs, &cfg) } |