diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 117cd7b7a3..77378ef1bd 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -20,6 +20,7 @@ {{- else if .Issue.PullRequest.CanAutoMerge}}green {{- else}}red{{end}}">{{svg "octicon-git-merge" 40}}</div> <div class="content"> + {{if .LatestCommitStatus}} <div class="ui attached segment fitted"> {{template "repo/pulls/status" (dict "CommitStatus" .LatestCommitStatus @@ -29,8 +30,9 @@ "is_context_required" .is_context_required )}} </div> + {{end}} {{$showGeneralMergeForm := false}} - <div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}} flex-items-block"> + <div class="ui attached segment merge-section {{if not $.LatestCommitStatus}}no-header{{end}} flex-items-block"> {{if .Issue.PullRequest.HasMerged}} {{if .IsPullBranchDeletable}} <div class="item item-section text tw-flex-1"> |