diff options
Diffstat (limited to 'templates/repo/issue/view_content.tmpl')
| -rw-r--r-- | templates/repo/issue/view_content.tmpl | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 13729c95a8..2fd0d064df 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -133,7 +133,13 @@ {{if .Issue.IsPull}} <div class="comment merge box"> - <a class="avatar text {{if .Issue.HasMerged}}purple{{else if .Issue.IsClosed}}grey{{else if and .Issue.CanAutoMerge (not .IsPullReuqestBroken)}}green{{else}}red{{end}}"> + <a class="avatar text + {{if .Issue.HasMerged}}purple + {{else if .Issue.IsClosed}}grey + {{else if .IsPullReuqestBroken}}red + {{else if .Issue.IsChecking}}yellow + {{else if .Issue.CanAutoMerge}}green + {{else}}red{{end}}"> <span class="mega-octicon octicon-git-merge"></span> </a> <div class="content"> @@ -151,6 +157,11 @@ <span class="octicon octicon-x"></span> {{$.i18n.Tr "repo.pulls.data_broken"}} </div> + {{else if .Issue.IsChecking}} + <div class="item text yellow"> + <span class="octicon octicon-sync"></span> + {{$.i18n.Tr "repo.pulls.is_checking"}} + </div> {{else if .Issue.CanAutoMerge}} <div class="item text green"> <span class="octicon octicon-check"></span> |