diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-03-12 10:48:51 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-03-12 10:48:51 +0000 |
| commit | e4b2c3b08b0aced417e072e60d5b299144c40474 (patch) | |
| tree | f345744e8a8d2322b728eb96527df8543a5cd736 | |
| parent | de61dc4ca60a6510d59c5817257920cda7fdefbe (diff) | |
| parent | 590f9a939e7c23f971ce1eee891fa9eeae34a947 (diff) | |
| download | gitlab-ce-e4b2c3b08b0aced417e072e60d5b299144c40474.tar.gz | |
Merge branch 'fix-ide-web-worker-relative-url' into 'master'
Fixed Web IDE web workers not loading with relative root URL
Closes #50451
See merge request gitlab-org/gitlab-ce!26015
| -rw-r--r-- | app/assets/javascripts/lib/utils/webpack.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-ide-web-worker-relative-url.yml | 5 |
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 |