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.

Keep committing ... spinner when conflict resolved
cbcf00e1 · Sean McGivern · 12fe6a6f · cbcf00e1
Commit cbcf00e1 authored Aug 19, 2016 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

merge_conflict_resolver.js.es6 app/assets/javascripts/merge_conflict_resolver.js.es6 +1 -3

No files found.
--- 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!');
      });
  }