Commit 171d919c authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'mr-web-worker-origin' into 'master'

Fixes diff web worker not loading in staging

See merge request gitlab-org/gitlab-ce!25039
parents c397cf67 37b860d7
...@@ -6,6 +6,7 @@ import ide from './components/ide.vue'; ...@@ -6,6 +6,7 @@ import ide from './components/ide.vue';
import store from './stores'; import store from './stores';
import router from './ide_router'; import router from './ide_router';
import { parseBoolean } from '../lib/utils/common_utils'; import { parseBoolean } from '../lib/utils/common_utils';
import { resetServiceWorkersPublicPath } from '../lib/utils/webpack';
Vue.use(Translate); Vue.use(Translate);
...@@ -60,16 +61,6 @@ export function initIde(el, options = {}) { ...@@ -60,16 +61,6 @@ export function initIde(el, options = {}) {
}); });
} }
// tell webpack to load assets from origin so that web workers don't break
export function resetServiceWorkersPublicPath() {
// __webpack_public_path__ is a global variable that can be used to adjust
// the webpack publicPath setting at runtime.
// 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
}
/** /**
* Start the IDE. * Start the IDE.
* *
......
// tell webpack to load assets from origin so that web workers don't break
// eslint-disable-next-line import/prefer-default-export
export function resetServiceWorkersPublicPath() {
// __webpack_public_path__ is a global variable that can be used to adjust
// the webpack publicPath setting at runtime.
// 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
}
...@@ -7,8 +7,11 @@ import discussionCounter from '../notes/components/discussion_counter.vue'; ...@@ -7,8 +7,11 @@ import discussionCounter from '../notes/components/discussion_counter.vue';
import initDiscussionFilters from '../notes/discussion_filters'; import initDiscussionFilters from '../notes/discussion_filters';
import store from './stores'; import store from './stores';
import MergeRequest from '../merge_request'; import MergeRequest from '../merge_request';
import { resetServiceWorkersPublicPath } from '../lib/utils/webpack';
export default function initMrNotes() { export default function initMrNotes() {
resetServiceWorkersPublicPath();
const mrShowNode = document.querySelector('.merge-request'); const mrShowNode = document.querySelector('.merge-request');
// eslint-disable-next-line no-new // eslint-disable-next-line no-new
new MergeRequest({ new MergeRequest({
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment