Ensure Update button is enabled even when CI has failed (#10640)
* ignore pull status * fix css * fix css
This commit is contained in:
parent
4a4fc73ee1
commit
57c7a7aa72
2 changed files with 26 additions and 22 deletions
|
@ -158,26 +158,6 @@
|
|||
{{$.i18n.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }}
|
||||
</div>
|
||||
{{end}}
|
||||
{{if and .Divergence (gt .Divergence.Behind 0)}}
|
||||
<div class="ui very compact branch-update grid">
|
||||
<div class="row">
|
||||
<div class="item text gray eleven wide left floated column">
|
||||
<i class="icon icon-octicon">{{svg "octicon-alert" 16}}</i>
|
||||
{{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}}
|
||||
</div>
|
||||
{{if .UpdateAllowed}}
|
||||
<div class="item text five wide right floated column">
|
||||
<form action="{{.Link}}/update" method="post">
|
||||
{{.CsrfTokenHtml}}
|
||||
<button class="ui button" data-do="update">
|
||||
<span class="item text">{{$.i18n.Tr "repo.pulls.update_branch"}}</span>
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
{{end}}
|
||||
{{if .AllowMerge}}
|
||||
{{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}}
|
||||
{{$approvers := .Issue.PullRequest.GetApprovers}}
|
||||
|
@ -307,6 +287,26 @@
|
|||
</div>
|
||||
{{end}}
|
||||
{{end}}
|
||||
{{if and .Divergence (gt .Divergence.Behind 0)}}
|
||||
<div class="ui very compact branch-update grid">
|
||||
<div class="row">
|
||||
<div class="item text gray eleven wide left floated column">
|
||||
<i class="icon icon-octicon">{{svg "octicon-alert" 16}}</i>
|
||||
{{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}}
|
||||
</div>
|
||||
{{if .UpdateAllowed}}
|
||||
<div class="item text five wide right floated column">
|
||||
<form action="{{.Link}}/update" method="post">
|
||||
{{.CsrfTokenHtml}}
|
||||
<button class="ui button" data-do="update">
|
||||
<span class="item text">{{$.i18n.Tr "repo.pulls.update_branch"}}</span>
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
{{end}}
|
||||
{{else}}
|
||||
{{/* Merge conflict without specific file. Suggest manual merge, only if all reviews and status checks OK. */}}
|
||||
{{if .IsBlockedByApprovals}}
|
||||
|
|
|
@ -659,10 +659,14 @@
|
|||
padding-left: 2px;
|
||||
}
|
||||
.branch-update.grid {
|
||||
margin-bottom: -1.5rem;
|
||||
margin-top: -.5rem;
|
||||
.row {
|
||||
padding-bottom: 0;
|
||||
.icon {
|
||||
margin-top: 1.1rem;
|
||||
}
|
||||
.ui.button {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Reference in a new issue