diff options
| author | Unknwon <u@gogs.io> | 2015-10-24 03:36:47 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-10-24 03:36:47 -0400 |
| commit | 0fbb8c8826771e92e890fb1c72b356d3e62c7b01 (patch) | |
| tree | 2695707e4789a6611fa35393b06631848657469a /templates | |
| parent | e0aab4a7f6c1f1b5cc7fa40e2c09623b635bc4a6 (diff) | |
| download | gitea-0fbb8c8826771e92e890fb1c72b356d3e62c7b01.tar.gz gitea-0fbb8c8826771e92e890fb1c72b356d3e62c7b01.zip | |
New push to head repo of head branch: regenerate patch and retest apply
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/repo/issue/view_content.tmpl | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index f179151c0f..b4080f5ea3 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.16.1023 Beta
\ No newline at end of file +0.6.17.1024 Beta
\ No newline at end of file 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> |