1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00

fix pull view ui merge section (#7335)

* fix pull view ui merge section

* fix tests

* fix tests
This commit is contained in:
Lunny Xiao
2019-07-01 12:08:43 +08:00
committed by techknowlogick
parent 9c6af9d2bb
commit 1772c6b94d
2 changed files with 2 additions and 2 deletions

View File

@@ -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"}}