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

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

No files matched your search

+3
View File
@@ -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)
}