diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-01-25 14:40:48 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-01-25 14:40:48 -0600 |
| commit | 8210d2eba5f0a52759156bc2bf8df72884747c42 (patch) | |
| tree | 12bdf7e23a9719ad38d5923c143e577b1a476b86 | |
| parent | 218136ac40547e82bc49562805b1af983d956e72 (diff) | |
| download | gitlab-ce-fix-local-rspec-tests.tar.gz | |
fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec testsfix-local-rspec-tests
| -rw-r--r-- | app/helpers/webpack_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |