diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-04-09 06:57:50 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-04-09 06:57:50 +0000 |
| commit | 5cc1d2f1ef2fd64662e1a1f9b72dd59b0ec98625 (patch) | |
| tree | b8ecf9772380acd9baab71b91ed0782f3975655e | |
| parent | 498fa739c4b7ab7275baef769f9da91ae1591a9d (diff) | |
| parent | 596d5fa21a9563f9648ee33ca0f1e254114c8c0b (diff) | |
| download | gitlab-ce-5cc1d2f1ef2fd64662e1a1f9b72dd59b0ec98625.tar.gz | |
Merge branch 'revert-e4b2c3b0' into 'master'
Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'"
Closes #60217
See merge request gitlab-org/gitlab-ce!26066
| -rw-r--r-- | app/assets/javascripts/lib/utils/webpack.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/lib/utils/webpack.js b/app/assets/javascripts/lib/utils/webpack.js index a4dad6f1615..37b5409a51d 100644 --- a/app/assets/javascripts/lib/utils/webpack.js +++ b/app/assets/javascripts/lib/utils/webpack.js @@ -6,5 +6,11 @@ export function resetServiceWorkersPublicPath() { // see: https://webpack.js.org/guides/public-path/ const relativeRootPath = (gon && gon.relative_url_root) || ''; const webpackAssetPath = `${relativeRootPath}/assets/webpack/`; + __webpack_public_path__ = webpackAssetPath; // eslint-disable-line camelcase + + // monaco-editor-webpack-plugin currently (incorrectly) references the + // public path as a property of `window`. Once this is fixed upstream we + // can remove this line + // see: https://github.com/Microsoft/monaco-editor-webpack-plugin/pull/63 window.__webpack_public_path__ = webpackAssetPath; // eslint-disable-line } |