|
283 | 283 | {{end}} |
284 | 284 | {{end}} |
285 | 285 |
|
286 | | - {{if (gt .Issue.PullRequest.CommitsBehind 0)}} |
| 286 | + {{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}} |
287 | 287 | <div class="ui divider"></div> |
288 | 288 | <div class="item item-section"> |
289 | 289 | <div class="item-section-left"> |
|
481 | 481 | {{end}} |
482 | 482 | {{end}} |
483 | 483 |
|
484 | | - {{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}} |
485 | | - <div class="item df ac sb"> |
486 | | - <div> |
487 | | - <i class="icon icon-octicon">{{svg "octicon-alert"}}</i> |
488 | | - {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}} |
489 | | - </div> |
490 | | - <div> |
491 | | - {{if and .UpdateAllowed .UpdateByRebaseAllowed }} |
492 | | - <div class="dib"> |
493 | | - <div class="ui buttons update-button"> |
494 | | - <button class="ui button" data-do="{{.Link}}/update" data-redirect="{{.Link}}"> |
495 | | - <span class="button-text"> |
496 | | - {{$.i18n.Tr "repo.pulls.update_branch"}} |
497 | | - </span> |
498 | | - </button> |
499 | | - |
500 | | - <div class="ui dropdown icon button no-text"> |
501 | | - {{svg "octicon-triangle-down" 14 "dropdown icon"}} |
502 | | - <div class="menu"> |
503 | | - <div class="item active selected" data-do="{{.Link}}/update">{{$.i18n.Tr "repo.pulls.update_branch"}}</div> |
504 | | - <div class="item" data-do="{{.Link}}/update?style=rebase">{{$.i18n.Tr "repo.pulls.update_branch_rebase"}}</div> |
505 | | - </div> |
506 | | - </div> |
507 | | - </div> |
508 | | - </div> |
509 | | - {{end}} |
510 | | - {{if and .UpdateAllowed (not .UpdateByRebaseAllowed)}} |
511 | | - <form action="{{.Link}}/update" method="post"> |
512 | | - {{.CsrfTokenHtml}} |
513 | | - <button class="ui compact button" data-do="update"> |
514 | | - <span class="ui text">{{$.i18n.Tr "repo.pulls.update_branch"}}</span> |
515 | | - </button> |
516 | | - </form> |
517 | | - {{end}} |
518 | | - </div> |
519 | | - </div> |
520 | | - {{end}} |
521 | | - |
522 | 484 | {{if $.StillCanManualMerge}} |
523 | 485 | <div class="ui divider"></div> |
524 | 486 | <div class="ui form manually-merged-fields" style="display: none"> |
|
0 commit comments