launchpad-reviewers team mailing list archive

[Tom Wardill <tom.wardill@xxxxxxxxxxxxx>]

Tom Wardill has proposed merging ~twom/launchpad:move-propose-for-merging into launchpad:master.

Commit message:
Move Propose for merging to top

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1890754 in Launchpad itself: "Move "Propose for merging" to the top"
  https://bugs.launchpad.net/launchpad/+bug/1890754

For more details, see:
https://code.launchpad.net/~twom/launchpad/+git/launchpad/+merge/388907

When a branch is reused, there's a lot of targets when all you want to do is create a new Merge Proposal.
Move the action to the top of the list.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~twom/launchpad:move-propose-for-merging into launchpad:master.

diff --git a/lib/lp/code/templates/branch-pending-merges.pt b/lib/lp/code/templates/branch-pending-merges.pt
index 6e098b5..b506fa7 100644
--- a/lib/lp/code/templates/branch-pending-merges.pt
+++ b/lib/lp/code/templates/branch-pending-merges.pt
@@ -10,6 +10,11 @@
   <h3>Branch merges</h3>
   <div id="merge-links"
        class="actions">
+    <div
+      tal:define="link context_menu/register_merge"
+      tal:condition="link/enabled"
+      tal:replace="structure link/render"
+      />
     <div id="merge-summary">
 
       <div id="landing-candidates"
@@ -43,11 +48,6 @@
       </div>
 
     </div>
-    <div
-      tal:define="link context_menu/register_merge"
-      tal:condition="link/enabled"
-      tal:replace="structure link/render"
-      />
   </div>
 
 </div>
diff --git a/lib/lp/code/templates/gitref-pending-merges.pt b/lib/lp/code/templates/gitref-pending-merges.pt
index 5d41ce8..02d8e03 100644
--- a/lib/lp/code/templates/gitref-pending-merges.pt
+++ b/lib/lp/code/templates/gitref-pending-merges.pt
@@ -10,6 +10,11 @@
   <h3>Branch merges</h3>
   <div id="merge-links"
        class="actions">
+    <div
+      tal:define="link context_menu/register_merge"
+      tal:condition="link/enabled"
+      tal:replace="structure link/render"
+      />
     <div id="merge-summary">
 
       <div id="landing-candidates"
@@ -38,11 +43,6 @@
       </div>
 
     </div>
-    <div
-      tal:define="link context_menu/register_merge"
-      tal:condition="link/enabled"
-      tal:replace="structure link/render"
-      />
     <div tal:condition="python: view.propose_merge_notes and context_menu['register_merge'].enabled">
       <ul>
         <li tal:repeat="message view/propose_merge_notes" class="registered">