summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-03-12 09:27:58 +0000
committerPhil Hughes <me@iamphill.com>2019-03-12 09:27:58 +0000
commit590f9a939e7c23f971ce1eee891fa9eeae34a947 (patch)
tree4f802ed9ad80063db868dd6b6ebc0e7f67cf6033
parentaaee3fb4a608d291a49ff3194cf34053daf57d5e (diff)
downloadgitlab-ce-590f9a939e7c23f971ce1eee891fa9eeae34a947.tar.gz
Fixed Web IDE web workers not loading with relative root URL
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50451
-rw-r--r--app/assets/javascripts/lib/utils/webpack.js2
-rw-r--r--changelogs/unreleased/fix-ide-web-worker-relative-url.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/webpack.js b/app/assets/javascripts/lib/utils/webpack.js
index 308ad9784e4..a4dad6f1615 100644
--- a/app/assets/javascripts/lib/utils/webpack.js
+++ b/app/assets/javascripts/lib/utils/webpack.js
@@ -6,5 +6,5 @@ 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
+ window.__webpack_public_path__ = webpackAssetPath; // eslint-disable-line
}
diff --git a/changelogs/unreleased/fix-ide-web-worker-relative-url.yml b/changelogs/unreleased/fix-ide-web-worker-relative-url.yml
new file mode 100644
index 00000000000..2accad68c4e
--- /dev/null
+++ b/changelogs/unreleased/fix-ide-web-worker-relative-url.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed Web IDE web workers not working with relative URLs
+merge_request:
+author:
+type: fixed