1 files changed, 2 insertions, 0 deletions
diff --git a/models/repo_unit.go b/models/repo_unit.go
index 9eaec884bb..430f5a242f 100644
--- a/models/repo_unit.go
+++ b/models/repo_unit.go
@@ -91,6 +91,7 @@ type PullRequestsConfig struct {
 	IgnoreWhitespaceConflicts bool
 	AllowMerge                bool
 	AllowRebase               bool
+	AllowRebaseMerge          bool
 	AllowSquash               bool
 }
 
@@ -108,6 +109,7 @@ func (cfg *PullRequestsConfig) ToDB() ([]byte, error) {
 func (cfg *PullRequestsConfig) IsMergeStyleAllowed(mergeStyle MergeStyle) bool {
 	return mergeStyle == MergeStyleMerge && cfg.AllowMerge ||
 		mergeStyle == MergeStyleRebase && cfg.AllowRebase ||
+		mergeStyle == MergeStyleRebaseMerge && cfg.AllowRebaseMerge ||
 		mergeStyle == MergeStyleSquash && cfg.AllowSquash
 }