diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-08-29 21:09:27 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-08-29 21:09:27 +0800 |
commit | 110d7fb78c0edf2e18c70ff3d9b60671f6935977 (patch) | |
tree | d05720cfd55e3b91e067aaeca5731572e5853e4e /app/assets/javascripts/repo/monaco_loader.js | |
parent | 00b440443808fba04fc55f7e77c61f79e29c21ea (diff) | |
parent | 01785533a5ba26e9dbed7972d9732a9b122ff3e0 (diff) | |
download | gitlab-ce-110d7fb78c0edf2e18c70ff3d9b60671f6935977.tar.gz |
Merge remote-tracking branch 'upstream/master' into perf.slow-issuable
* upstream/master: (206 commits)
Resolve "Monitoring graph date formatting is wrong"
Add styles for shorter code
Update doc for dind using overlay2
Cleans merge_jid when possible on MergeService
Rename MergeRequest#async_merge to merge_async
Add changelog
Track enqueued and ongoing MRs
Remove locked? check when unlocking a merge request
Update CHANGELOG.md for 9.5.2
Update rubocop-gitlab-security to 0.1.0
Fix spec
Fix changelog
Fix spec
Add changelog
Remove trigger_request.trigger.owner
Reproduced bug
Fix a transient failure in mini_pipeline_graph_spec
fix typo
fix spec
Fix events error importing GitLab projects
...
Diffstat (limited to 'app/assets/javascripts/repo/monaco_loader.js')
-rw-r--r-- | app/assets/javascripts/repo/monaco_loader.js | 6 |
1 files changed, 2 insertions, 4 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; |