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
9328c75e
Commit
9328c75e
authored
May 03, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove force_same_domain option from webpack helpers
parent
4bdfcc58
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
app/helpers/webpack_helper.rb
app/helpers/webpack_helper.rb
+6
-8
No files found.
app/helpers/webpack_helper.rb
View file @
9328c75e
require
'gitlab/webpack/manifest'
require
'gitlab/webpack/manifest'
module
WebpackHelper
module
WebpackHelper
def
webpack_bundle_tag
(
bundle
,
force_same_domain:
false
)
def
webpack_bundle_tag
(
bundle
)
javascript_include_tag
(
*
entrypoint_paths
(
bundle
,
force_same_domain:
force_same_domain
))
javascript_include_tag
(
*
entrypoint_paths
(
bundle
))
end
end
def
webpack_controller_bundle_tags
def
webpack_controller_bundle_tags
...
@@ -33,7 +33,7 @@ module WebpackHelper
...
@@ -33,7 +33,7 @@ module WebpackHelper
javascript_include_tag
(
*
chunks
)
javascript_include_tag
(
*
chunks
)
end
end
def
entrypoint_paths
(
source
,
extension:
nil
,
force_same_domain:
false
)
def
entrypoint_paths
(
source
,
extension:
nil
)
return
""
unless
source
.
present?
return
""
unless
source
.
present?
paths
=
Gitlab
::
Webpack
::
Manifest
.
entrypoint_paths
(
source
)
paths
=
Gitlab
::
Webpack
::
Manifest
.
entrypoint_paths
(
source
)
...
@@ -41,11 +41,9 @@ module WebpackHelper
...
@@ -41,11 +41,9 @@ module WebpackHelper
paths
.
select!
{
|
p
|
p
.
ends_with?
".
#{
extension
}
"
}
paths
.
select!
{
|
p
|
p
.
ends_with?
".
#{
extension
}
"
}
end
end
unless
force_same_domain
force_host
=
webpack_public_host
force_host
=
webpack_public_host
if
force_host
if
force_host
paths
.
map!
{
|
p
|
"
#{
force_host
}#{
p
}
"
}
paths
.
map!
{
|
p
|
"
#{
force_host
}#{
p
}
"
}
end
end
end
paths
paths
...
...
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