From 57c7a7aa721d3422fab3ea297cab5969e72e63f5 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 7 Mar 2020 02:24:42 +0100
Subject: [PATCH] Ensure Update button is enabled even when CI has failed
 (#10640)

* ignore pull status

* fix css

* fix css
---
 templates/repo/issue/view_content/pull.tmpl | 40 ++++++++++-----------
 web_src/less/_repository.less               |  8 +++--
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 0d98f08e69c..758733fc44f 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -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}}
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index 65b722d2684..255dd3d336b 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -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;
+                        }
                     }
                 }
             }