Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
37b860d7
Commit
37b860d7
authored
Feb 08, 2019
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes diff web worker not loading in staging
https://gitlab.com/gitlab-org/quality/staging/issues/34
parent
d3233151
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
10 deletions
+14
-10
app/assets/javascripts/ide/index.js
app/assets/javascripts/ide/index.js
+1
-10
app/assets/javascripts/lib/utils/webpack.js
app/assets/javascripts/lib/utils/webpack.js
+10
-0
app/assets/javascripts/mr_notes/index.js
app/assets/javascripts/mr_notes/index.js
+3
-0
No files found.
app/assets/javascripts/ide/index.js
View file @
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.
*
*
...
...
app/assets/javascripts/lib/utils/webpack.js
0 → 100644
View file @
37b860d7
// 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
}
app/assets/javascripts/mr_notes/index.js
View file @
37b860d7
...
@@ -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
({
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment