summaryrefslogtreecommitdiffstats
path: root/models/repo/repo_unit.go
diff options
context:
space:
mode:
Diffstat (limited to 'models/repo/repo_unit.go')
-rw-r--r--models/repo/repo_unit.go3
1 files changed, 3 insertions, 0 deletions
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)
}