diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-08-22 20:54:19 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-08-22 20:54:19 +0300 |
commit | c635e80103b78b39fa069ba22925a85abf5c0eaf (patch) | |
tree | fa2d4efdc9abca25a2847954cb199395ef0ae64f /app | |
parent | 27bdc4bbdd932121f86752067b983f2bd8bbfd12 (diff) | |
parent | a7eb806e93e44a35b6853491820d24b60c25bb1c (diff) |
Merge branch 'update-monaco-loader-test' into 'master'
Fix monaco loader test
See merge request !13682
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/repo/monaco_loader.js | 6 | ||||
-rw-r--r-- | app/assets/javascripts/webpack.js | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/repo/monaco_loader.js b/app/assets/javascripts/repo/monaco_loader.js index ad1370a7730..af83a1ec0b4 100644 --- a/app/assets/javascripts/repo/monaco_loader.js +++ b/app/assets/javascripts/repo/monaco_loader.js @@ -1,13 +1,11 @@ -/* eslint-disable no-underscore-dangle, camelcase */ -/* global __webpack_public_path__ */ - import monacoContext from 'monaco-editor/dev/vs/loader'; monacoContext.require.config({ paths: { - vs: `${__webpack_public_path__}monaco-editor/vs`, + vs: `${__webpack_public_path__}monaco-editor/vs`, // eslint-disable-line camelcase }, }); +// eslint-disable-next-line no-underscore-dangle window.__monaco_context__ = monacoContext; export default monacoContext.require; diff --git a/app/assets/javascripts/webpack.js b/app/assets/javascripts/webpack.js index 9a9cf395fb8..ced847294ae 100644 --- a/app/assets/javascripts/webpack.js +++ b/app/assets/javascripts/webpack.js @@ -5,5 +5,5 @@ */ if (gon && gon.webpack_public_path) { - __webpack_public_path__ = gon.webpack_public_path; // eslint-disable-line + __webpack_public_path__ = gon.webpack_public_path; // eslint-disable-line camelcase } |