diff options
Diffstat (limited to 'routers/repo/issue.go')
| -rw-r--r-- | routers/repo/issue.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 3600120fb5..f025cc3887 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -843,6 +843,8 @@ func ViewIssue(ctx *context.Context) { ctx.Data["MergeStyle"] = models.MergeStyleMerge } else if prConfig.AllowRebase { ctx.Data["MergeStyle"] = models.MergeStyleRebase + } else if prConfig.AllowRebaseMerge { + ctx.Data["MergeStyle"] = models.MergeStyleRebaseMerge } else if prConfig.AllowSquash { ctx.Data["MergeStyle"] = models.MergeStyleSquash } else { |