diff options
| author | Phil Hughes <me@iamphill.com> | 2018-02-02 19:33:38 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-02-02 19:33:38 +0300 |
| commit | 965ff9653dee8cc24c13502714e1dad9a2cdb3a2 (patch) | |
| tree | d5fb22f9f93cf9621db885b3fa2438689ad3a1bf /app/assets/javascripts/merge_conflicts | |
| parent | 645d635976ef48905c0416bd2a4a25025fef9ee4 (diff) | |
added missing calls in catch statements
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js index bc805047f73..b4b3c15108d 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js @@ -53,6 +53,7 @@ $(() => { }); }) .catch(() => { + mergeConflictsStore.setLoadingState(false); mergeConflictsStore.setFailedRequest(); }); }, |