summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-08-10 14:51:17 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-08-14 11:10:59 -0500
commitcdd28b305d6a502b0557e968cadaf5b06ff2a5bd (patch)
tree68e6e0cee42e3cbe92d6456ca1762eb180cc05e5
parent6bf4a06ee93be4cb7b3f818716c3a32311559729 (diff)
downloadgitlab-ce-cdd28b305d6a502b0557e968cadaf5b06ff2a5bd.tar.gz
Reset monacoLoading on failure
Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12198#note_37144070
-rw-r--r--app/assets/javascripts/repo/helpers/monaco_loader_helper.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/repo/helpers/monaco_loader_helper.js b/app/assets/javascripts/repo/helpers/monaco_loader_helper.js
index 8ee2df5c879..c1a0e80f8f3 100644
--- a/app/assets/javascripts/repo/helpers/monaco_loader_helper.js
+++ b/app/assets/javascripts/repo/helpers/monaco_loader_helper.js
@@ -10,7 +10,10 @@ function repoEditorLoader() {
Store.monaco = monaco;
Store.monacoLoading = false;
resolve(RepoEditor);
- }, reject);
+ }, () => {
+ Store.monacoLoading = false;
+ reject();
+ });
});
}