diff --git a/models/repo_unit.go b/models/repo_unit.go index d4c74515f7..b208276d9d 100644 --- a/models/repo_unit.go +++ b/models/repo_unit.go @@ -113,6 +113,24 @@ func (cfg *PullRequestsConfig) IsMergeStyleAllowed(mergeStyle MergeStyle) bool { mergeStyle == MergeStyleSquash && cfg.AllowSquash } +// AllowedMergeStyleCount returns the total count of allowed merge styles for the PullRequestsConfig +func (cfg *PullRequestsConfig) AllowedMergeStyleCount() int { + count := 0 + if cfg.AllowMerge { + count++ + } + if cfg.AllowRebase { + count++ + } + if cfg.AllowRebaseMerge { + count++ + } + if cfg.AllowSquash { + count++ + } + return count +} + // BeforeSet is invoked from XORM before setting the value of a field of this object. func (r *RepoUnit) BeforeSet(colName string, val xorm.Cell) { switch colName { diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 347b3b15d3..f7870d60d2 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -335,23 +335,25 @@ {{end}} -
{{else}}