diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-01-19 09:38:34 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-01-19 09:38:34 +0000 |
commit | e79db43d2cf269beec700353e776e92b15ac9af9 (patch) | |
tree | 5e4a6ab9b4843c58288c670d5eabe7ff2f31fee1 /app/helpers/webpack_helper.rb | |
parent | dd633dc48f00f779755370e3849691dc776b5055 (diff) | |
download | gitlab-ce-e79db43d2cf269beec700353e776e92b15ac9af9.tar.gz |
WebIDE: Fix Commit bugs
Diffstat (limited to 'app/helpers/webpack_helper.rb')
-rw-r--r-- | app/helpers/webpack_helper.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/app/helpers/webpack_helper.rb b/app/helpers/webpack_helper.rb index 33453dd178f..94887c2cbd2 100644 --- a/app/helpers/webpack_helper.rb +++ b/app/helpers/webpack_helper.rb @@ -1,12 +1,12 @@ require 'webpack/rails/manifest' module WebpackHelper - def webpack_bundle_tag(bundle) - javascript_include_tag(*gitlab_webpack_asset_paths(bundle)) + def webpack_bundle_tag(bundle, force_same_domain: false) + javascript_include_tag(*gitlab_webpack_asset_paths(bundle, force_same_domain: true)) end # override webpack-rails gem helper until changes can make it upstream - def gitlab_webpack_asset_paths(source, extension: nil) + def gitlab_webpack_asset_paths(source, extension: nil, force_same_domain: false) return "" unless source.present? paths = Webpack::Rails::Manifest.asset_paths(source) @@ -14,9 +14,11 @@ module WebpackHelper paths.select! { |p| p.ends_with? ".#{extension}" } end - force_host = webpack_public_host - if force_host - paths.map! { |p| "#{force_host}#{p}" } + unless force_same_domain + force_host = webpack_public_host + if force_host + paths.map! { |p| "#{force_host}#{p}" } + end end paths |