diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-08-29 21:54:44 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-29 21:54:44 +0000 |
| commit | b283185b384da66b08e9daf40cddf5442556f6ad (patch) | |
| tree | 8ca210e522271d6de81c7b60340922622fda7e6e | |
| parent | b94f26ce1de75476aeb468ee594d71c026fa6761 (diff) | |
| parent | cbcf00e1b972265713bb68cc679216398a44c993 (diff) | |
| download | gitlab-ce-b283185b384da66b08e9daf40cddf5442556f6ad.tar.gz | |
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:
I don't think this needs a CHANGELOG entry as it's pretty minor.
See merge request !5892
| -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!'); }); } |