|
|
@ -283,7 +283,7 @@ |
|
|
|
{{end}} |
|
|
|
{{end}} |
|
|
|
{{end}} |
|
|
|
{{end}} |
|
|
|
|
|
|
|
|
|
|
|
{{if (gt .Issue.PullRequest.CommitsBehind 0)}} |
|
|
|
{{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}} |
|
|
|
<div class="ui divider"></div> |
|
|
|
<div class="ui divider"></div> |
|
|
|
<div class="item item-section"> |
|
|
|
<div class="item item-section"> |
|
|
|
<div class="item-section-left"> |
|
|
|
<div class="item-section-left"> |
|
|
@ -481,44 +481,6 @@ |
|
|
|
{{end}} |
|
|
|
{{end}} |
|
|
|
{{end}} |
|
|
|
{{end}} |
|
|
|
|
|
|
|
|
|
|
|
{{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}} |
|
|
|
|
|
|
|
<div class="item df ac sb"> |
|
|
|
|
|
|
|
<div> |
|
|
|
|
|
|
|
<i class="icon icon-octicon">{{svg "octicon-alert"}}</i> |
|
|
|
|
|
|
|
{{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}} |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
<div> |
|
|
|
|
|
|
|
{{if and .UpdateAllowed .UpdateByRebaseAllowed }} |
|
|
|
|
|
|
|
<div class="dib"> |
|
|
|
|
|
|
|
<div class="ui buttons update-button"> |
|
|
|
|
|
|
|
<button class="ui button" data-do="{{.Link}}/update" data-redirect="{{.Link}}"> |
|
|
|
|
|
|
|
<span class="button-text"> |
|
|
|
|
|
|
|
{{$.i18n.Tr "repo.pulls.update_branch"}} |
|
|
|
|
|
|
|
</span> |
|
|
|
|
|
|
|
</button> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="ui dropdown icon button no-text"> |
|
|
|
|
|
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}} |
|
|
|
|
|
|
|
<div class="menu"> |
|
|
|
|
|
|
|
<div class="item active selected" data-do="{{.Link}}/update">{{$.i18n.Tr "repo.pulls.update_branch"}}</div> |
|
|
|
|
|
|
|
<div class="item" data-do="{{.Link}}/update?style=rebase">{{$.i18n.Tr "repo.pulls.update_branch_rebase"}}</div> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
{{end}} |
|
|
|
|
|
|
|
{{if and .UpdateAllowed (not .UpdateByRebaseAllowed)}} |
|
|
|
|
|
|
|
<form action="{{.Link}}/update" method="post"> |
|
|
|
|
|
|
|
{{.CsrfTokenHtml}} |
|
|
|
|
|
|
|
<button class="ui compact button" data-do="update"> |
|
|
|
|
|
|
|
<span class="ui text">{{$.i18n.Tr "repo.pulls.update_branch"}}</span> |
|
|
|
|
|
|
|
</button> |
|
|
|
|
|
|
|
</form> |
|
|
|
|
|
|
|
{{end}} |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
{{end}} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{{if $.StillCanManualMerge}} |
|
|
|
{{if $.StillCanManualMerge}} |
|
|
|
<div class="ui divider"></div> |
|
|
|
<div class="ui divider"></div> |
|
|
|
<div class="ui form manually-merged-fields" style="display: none"> |
|
|
|
<div class="ui form manually-merged-fields" style="display: none"> |
|
|
|