From 1772c6b94d8e1a574d29643a33f1c0dbc0fdbe6f Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Mon, 1 Jul 2019 12:08:43 +0800
Subject: fix pull view ui merge section (#7335)

* fix pull view ui merge section

* fix tests

* fix tests
---
 templates/repo/issue/view_content/pull.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/repo')

diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index caadba41c7..7bb3c91275 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -46,7 +46,7 @@
 	{{else}}red{{end}}"><span class="mega-octicon octicon-git-merge"></span></a>
 	<div class="content">
 		{{template "repo/pulls/status" .}}
-		<div class="ui attached merge-section segment">
+		<div class="ui {{if not $.LatestCommitStatus}}top attached header{{else}}attached merge-section segment{{end}}">
 			{{if .Issue.PullRequest.HasMerged}}
 				<div class="item text purple">
 					{{$.i18n.Tr "repo.pulls.has_merged"}}
-- 
cgit v1.2.3