From 1e05adfc3eeeeee04be48c683185886fa4b00dee Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 17 Jun 2022 12:52:06 +0800 Subject: [PATCH] Delete duplicated update btn on pull request view page (#19993) Fix #19987 --- templates/repo/issue/view_content/pull.tmpl | 40 +-------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index d2282f07f6..5a23bfa33b 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -283,7 +283,7 @@ {{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)}}
@@ -481,44 +481,6 @@ {{end}} {{end}} - {{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}} -
-
- {{svg "octicon-alert"}} - {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}} -
-
- {{if and .UpdateAllowed .UpdateByRebaseAllowed }} -
-
- - - -
-
- {{end}} - {{if and .UpdateAllowed (not .UpdateByRebaseAllowed)}} -
- {{.CsrfTokenHtml}} - -
- {{end}} -
-
- {{end}} - {{if $.StillCanManualMerge}}