From 8210d2eba5f0a52759156bc2bf8df72884747c42 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 25 Jan 2018 14:40:48 -0600 Subject: fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests --- app/helpers/webpack_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/webpack_helper.rb b/app/helpers/webpack_helper.rb index 94887c2cbd2..77433acb92a 100644 --- a/app/helpers/webpack_helper.rb +++ b/app/helpers/webpack_helper.rb @@ -2,7 +2,7 @@ require 'webpack/rails/manifest' module WebpackHelper def webpack_bundle_tag(bundle, force_same_domain: false) - javascript_include_tag(*gitlab_webpack_asset_paths(bundle, force_same_domain: true)) + javascript_include_tag(*gitlab_webpack_asset_paths(bundle, force_same_domain: force_same_domain)) end # override webpack-rails gem helper until changes can make it upstream -- cgit v1.2.1