From 26590b83c216764be6d8d0e5c32ef6b4601b15c8 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 16 Jul 2020 15:22:41 -0600
Subject: [PATCH 1/2] Move WIP as low as possible but still above unresolved
 discussions

Also tests the (existing, untested) rebase state
---
 .../vue_merge_request_widget/stores/get_state_key.js      | 4 ++--
 spec/frontend/vue_mr_widget/stores/get_state_key_spec.js  | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js
index a2ee0bc3ca18f6..44e8167d6a3c90 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js
@@ -11,12 +11,12 @@ export default function deviseState(data) {
     return stateKey.checking;
   } else if (data.has_conflicts) {
     return stateKey.conflicts;
-  } else if (data.work_in_progress) {
-    return stateKey.workInProgress;
   } else if (this.shouldBeRebased) {
     return stateKey.rebase;
   } else if (this.onlyAllowMergeIfPipelineSucceeds && this.isPipelineFailed) {
     return stateKey.pipelineFailed;
+  } else if (data.work_in_progress) {
+    return stateKey.workInProgress;
   } else if (this.hasMergeableDiscussionsState) {
     return stateKey.unresolvedDiscussions;
   } else if (this.isPipelineBlocked) {
diff --git a/spec/frontend/vue_mr_widget/stores/get_state_key_spec.js b/spec/frontend/vue_mr_widget/stores/get_state_key_spec.js
index e54cd345a37d4c..1cb2c6c669b940 100644
--- a/spec/frontend/vue_mr_widget/stores/get_state_key_spec.js
+++ b/spec/frontend/vue_mr_widget/stores/get_state_key_spec.js
@@ -49,14 +49,18 @@ describe('getStateKey', () => {
 
     expect(bound()).toEqual('unresolvedDiscussions');
 
+    data.work_in_progress = true;
+
+    expect(bound()).toEqual('workInProgress');
+
     context.onlyAllowMergeIfPipelineSucceeds = true;
     context.isPipelineFailed = true;
 
     expect(bound()).toEqual('pipelineFailed');
 
-    data.work_in_progress = true;
+    context.shouldBeRebased = true;
 
-    expect(bound()).toEqual('workInProgress');
+    expect(bound()).toEqual('rebase');
 
     data.has_conflicts = true;
 
-- 
GitLab


From c53a80a1656b38f728a2beb28a928e0d7d10770d Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Sun, 12 Jul 2020 17:33:23 -0600
Subject: [PATCH 2/2] Add changelog for checking WIP last

---
 changelogs/unreleased/mr-rebase-button-move-to-bottom.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/mr-rebase-button-move-to-bottom.yml

diff --git a/changelogs/unreleased/mr-rebase-button-move-to-bottom.yml b/changelogs/unreleased/mr-rebase-button-move-to-bottom.yml
new file mode 100644
index 00000000000000..45191e55ab81fe
--- /dev/null
+++ b/changelogs/unreleased/mr-rebase-button-move-to-bottom.yml
@@ -0,0 +1,5 @@
+---
+title: Check WIP status after all other possible statuses
+merge_request: 36624
+author:
+type: changed
-- 
GitLab