kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

remove force_same_domain option from webpack helpers

Browse source
This commit is contained in:
Mike Greiling 2018-05-03 11:59:03 -05:00
parent 4bdfcc580d
commit 9328c75e1a
No known key found for this signature in database
GPG key ID: 0303DF507FA67596
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/helpers/webpack_helper.rb
View file

@ -1,8 +1,8 @@
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
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
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