diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-19 12:12:50 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-19 12:12:50 +0100 |
| commit | cbcf00e1b972265713bb68cc679216398a44c993 (patch) | |
| tree | d08fba2e91442c4b7f841c2108db4e6b04f1f3cb | |
| parent | 12fe6a6fd733110acc72aa0f5bdaec2b1fa1f358 (diff) | |
| download | gitlab-ce-keep-committing-spinner-when-conflict-resolved.tar.gz | |
Keep committing ... spinner when conflict resolvedkeep-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.
| -rw-r--r-- | app/assets/javascripts/merge_conflict_resolver.js.es6 | 4 |
1 files changed, 1 insertions, 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!'); }); } |