From 78f41e4fc43cd903c95d501e40c3496689698cc4 Mon Sep 17 00:00:00 2001 From: Markus Amshove Date: Mon, 19 Feb 2024 21:48:17 +0100 Subject: Disallow merge when required checked are missing (#29143) (#29268) backport #29143 Co-authored-by: wxiaoguang --- templates/repo/pulls/status.tmpl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/repo/pulls/status.tmpl b/templates/repo/pulls/status.tmpl index 476b89a425..513ec98073 100644 --- a/templates/repo/pulls/status.tmpl +++ b/templates/repo/pulls/status.tmpl @@ -1,7 +1,7 @@ {{if $.LatestCommitStatus}} {{if not $.Issue.PullRequest.HasMerged}}
- {{if eq .LatestCommitStatus.State "pending"}} + {{if or (eq .LatestCommitStatus.State "pending") (.MissingRequiredChecks)}} {{ctx.Locale.Tr "repo.pulls.status_checking"}} {{else if eq .LatestCommitStatus.State "success"}} {{ctx.Locale.Tr "repo.pulls.status_checks_success"}} @@ -14,7 +14,7 @@ {{else}} {{ctx.Locale.Tr "repo.pulls.status_checking"}} {{end}} -
+ {{end}} {{range $.LatestCommitStatuses}} @@ -31,4 +31,15 @@ {{end}} + {{range .MissingRequiredChecks}} +
+ {{svg "octicon-dot-fill" 18 "commit-status icon text yellow"}} +
+ {{.}} +
+
{{ctx.Locale.Tr "repo.pulls.status_checks_requested"}}
+
+
+
+ {{end}} {{end}} -- cgit v1.2.3