From cbcf00e1b972265713bb68cc679216398a44c993 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Fri, 19 Aug 2016 12:12:50 +0100
Subject: Keep committing ... spinner when conflict resolved

When a conflict is resolved, we don't want to change the spinner back to
the normal button before the new page load happens, so only do this on
failure.
---
 app/assets/javascripts/merge_conflict_resolver.js.es6 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/assets/javascripts/merge_conflict_resolver.js.es6 b/app/assets/javascripts/merge_conflict_resolver.js.es6
index 77bffbcb403..b56fd5aa658 100644
--- a/app/assets/javascripts/merge_conflict_resolver.js.es6
+++ b/app/assets/javascripts/merge_conflict_resolver.js.es6
@@ -75,10 +75,8 @@ class MergeConflictResolver {
         window.location.href = data.redirect_to;
       })
       .error(() => {
-        new Flash('Something went wrong!');
-      })
-      .always(() => {
         this.vue.isSubmitting = false;
+        new Flash('Something went wrong!');
       });
   }
 
-- 
cgit v1.2.1