|
67 | 67 | {{- else if .IsBlockedByApprovals}}red
|
68 | 68 | {{- else if .IsBlockedByRejection}}red
|
69 | 69 | {{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsFailure .RequiredStatusCheckState.IsError)}}red
|
70 |
| - {{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}yellow |
| 70 | + {{- else if and .EnableStatusCheck (or (not $.LatestCommitStatus) .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}yellow |
71 | 71 | {{- else if and .RequireSigned (not .WillSign)}}}red
|
72 | 72 | {{- else if .Issue.PullRequest.IsChecking}}yellow
|
73 | 73 | {{- else if .Issue.PullRequest.CanAutoMerge}}green
|
|
143 | 143 | <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i>
|
144 | 144 | {{$.i18n.Tr "repo.pulls.required_status_check_failed"}}
|
145 | 145 | </div>
|
| 146 | + {{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}} |
| 147 | + <div class="item text red"> |
| 148 | + <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> |
| 149 | + {{$.i18n.Tr "repo.pulls.required_status_check_missing"}} |
| 150 | + </div> |
146 | 151 | {{else if and .RequireSigned (not .WillSign)}}
|
147 | 152 | <div class="item text red">
|
148 | 153 | <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i>
|
|
153 | 158 | {{$.i18n.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }}
|
154 | 159 | </div>
|
155 | 160 | {{end}}
|
156 |
| - {{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection (and .EnableStatusCheck (not .IsRequiredStatusCheckSuccess))}} |
| 161 | + {{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection (and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess))}} |
157 | 162 | {{if and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .RequireSigned) .WillSign)}}
|
158 | 163 | {{if $notAllOverridableChecksOk}}
|
159 | 164 | <div class="item text yellow">
|
|
337 | 342 | {{svg "octicon-x" 16}}
|
338 | 343 | {{$.i18n.Tr "repo.pulls.blocked_by_rejection"}}
|
339 | 344 | </div>
|
340 |
| - {{else if and .EnableStatusCheck (not .IsRequiredStatusCheckSuccess)}} |
| 345 | + {{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}} |
341 | 346 | <div class="item text red">
|
342 | 347 | {{svg "octicon-x" 16}}
|
343 | 348 | {{$.i18n.Tr "repo.pulls.required_status_check_failed"}}
|
|
0 commit comments