diff options
| author | Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> | 2020-12-18 13:37:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 13:37:55 +0100 |
| commit | efa9a8a6e308489cf5b5e0174007d78390c5f0e6 (patch) | |
| tree | 945e91e4bbe71b65f96012b6011d842a855c8f54 /templates/repo | |
| parent | 48bd02e753bf4bfe2d743ffed8ec05182f284ad0 (diff) | |
| download | gitea-efa9a8a6e308489cf5b5e0174007d78390c5f0e6.tar.gz gitea-efa9a8a6e308489cf5b5e0174007d78390c5f0e6.zip | |
Show status check for merged PRs (#13975)
* Show status check for merged PRs
* Handle PRs with no commits
* Styling
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'templates/repo')
| -rw-r--r-- | templates/repo/pulls/status.tmpl | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/templates/repo/pulls/status.tmpl b/templates/repo/pulls/status.tmpl index 2847903a52..e48f5f3fe3 100644 --- a/templates/repo/pulls/status.tmpl +++ b/templates/repo/pulls/status.tmpl @@ -1,19 +1,21 @@ {{if $.LatestCommitStatus}} - <div class="ui top attached header"> - {{if eq .LatestCommitStatus.State "pending"}} - {{$.i18n.Tr "repo.pulls.status_checking"}} - {{else if eq .LatestCommitStatus.State "success"}} - {{$.i18n.Tr "repo.pulls.status_checks_success"}} - {{else if eq .LatestCommitStatus.State "warning"}} - {{$.i18n.Tr "repo.pulls.status_checks_warning"}} - {{else if eq .LatestCommitStatus.State "failure"}} - {{$.i18n.Tr "repo.pulls.status_checks_failure"}} - {{else if eq .LatestCommitStatus.State "error"}} - {{$.i18n.Tr "repo.pulls.status_checks_error"}} - {{else}} - {{$.i18n.Tr "repo.pulls.status_checking"}} - {{end}} - </div> + {{if not $.Issue.PullRequest.HasMerged}} + <div class="ui top attached header"> + {{if eq .LatestCommitStatus.State "pending"}} + {{$.i18n.Tr "repo.pulls.status_checking"}} + {{else if eq .LatestCommitStatus.State "success"}} + {{$.i18n.Tr "repo.pulls.status_checks_success"}} + {{else if eq .LatestCommitStatus.State "warning"}} + {{$.i18n.Tr "repo.pulls.status_checks_warning"}} + {{else if eq .LatestCommitStatus.State "failure"}} + {{$.i18n.Tr "repo.pulls.status_checks_failure"}} + {{else if eq .LatestCommitStatus.State "error"}} + {{$.i18n.Tr "repo.pulls.status_checks_error"}} + {{else}} + {{$.i18n.Tr "repo.pulls.status_checking"}} + {{end}} + </div> + {{end}} {{range $.LatestCommitStatuses}} <div class="ui attached segment"> @@ -21,7 +23,7 @@ <span class="ui">{{.Context}} <span class="text grey">{{.Description}}</span></span> <div class="ui right"> {{if $.is_context_required}} - {{if (call $.is_context_required .Context)}}<div class="ui label">{{$.i18n.Tr "repo.pulls.status_checks_requested"}}</div>{{end}} + {{if (call $.is_context_required .Context)}}<div class="ui label">{{$.i18n.Tr "repo.pulls.status_checks_requested"}}</div>{{end}} {{end}} <span class="ui">{{if .TargetURL}}<a href="{{.TargetURL}}">{{$.i18n.Tr "repo.pulls.status_checks_details"}}</a>{{end}}</span> </div> |