|
|
@@ -67,7 +67,7 @@ |
|
|
|
{{- else if .IsBlockedByApprovals}}red |
|
|
|
{{- else if .IsBlockedByRejection}}red |
|
|
|
{{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsFailure .RequiredStatusCheckState.IsError)}}red |
|
|
|
{{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}yellow |
|
|
|
{{- else if and .EnableStatusCheck (or (not $.LatestCommitStatus) .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}yellow |
|
|
|
{{- else if and .RequireSigned (not .WillSign)}}}red |
|
|
|
{{- else if .Issue.PullRequest.IsChecking}}yellow |
|
|
|
{{- else if .Issue.PullRequest.CanAutoMerge}}green |
|
|
@@ -143,6 +143,11 @@ |
|
|
|
<i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> |
|
|
|
{{$.i18n.Tr "repo.pulls.required_status_check_failed"}} |
|
|
|
</div> |
|
|
|
{{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}} |
|
|
|
<div class="item text red"> |
|
|
|
<i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> |
|
|
|
{{$.i18n.Tr "repo.pulls.required_status_check_missing"}} |
|
|
|
</div> |
|
|
|
{{else if and .RequireSigned (not .WillSign)}} |
|
|
|
<div class="item text red"> |
|
|
|
<i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> |
|
|
@@ -153,7 +158,7 @@ |
|
|
|
{{$.i18n.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }} |
|
|
|
</div> |
|
|
|
{{end}} |
|
|
|
{{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection (and .EnableStatusCheck (not .IsRequiredStatusCheckSuccess))}} |
|
|
|
{{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection (and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess))}} |
|
|
|
{{if and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .RequireSigned) .WillSign)}} |
|
|
|
{{if $notAllOverridableChecksOk}} |
|
|
|
<div class="item text yellow"> |
|
|
@@ -337,7 +342,7 @@ |
|
|
|
{{svg "octicon-x" 16}} |
|
|
|
{{$.i18n.Tr "repo.pulls.blocked_by_rejection"}} |
|
|
|
</div> |
|
|
|
{{else if and .EnableStatusCheck (not .IsRequiredStatusCheckSuccess)}} |
|
|
|
{{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}} |
|
|
|
<div class="item text red"> |
|
|
|
{{svg "octicon-x" 16}} |
|
|
|
{{$.i18n.Tr "repo.pulls.required_status_check_failed"}} |