Merge branch 'keep-committing-spinner-when-conflict-resolved' into 'master'

Keep committing ... spinner when conflict resolved ## What does this MR do? When a conflict is resolved successfully, keep the 'committing ...' spinner until the new page loads rather than showing the standard button again, which is misleading. The old behaviour looks like this: ![Resolve_merge_conflict](/uploads/8e0efec0bb4b1358d4dd3353ea1dc57b/Resolve_merge_conflict.gif) I don't think this needs a CHANGELOG entry as it's pretty minor. See merge request !5892

Merge branch 'keep-committing-spinner-when-conflict-resolved' into 'master'
b283185b · Fatih Acet · b94f26ce · cbcf00e1 · b283185b
Commit b283185b authored Aug 29, 2016 by Fatih Acet
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!');
      });
  }