diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-01-26 01:12:11 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-01-26 01:12:11 +0000 |
| commit | 8e3f40f71fba520a9e05e13e7902a3dcdc0d7c15 (patch) | |
| tree | 7293af43be0064a12efb9b815d2c95499171c574 | |
| parent | 766d3b9de0f84335169497cd9ef1d30f225c9af8 (diff) | |
| parent | 8210d2eba5f0a52759156bc2bf8df72884747c42 (diff) | |
| download | gitlab-ce-8e3f40f71fba520a9e05e13e7902a3dcdc0d7c15.tar.gz | |
Merge branch 'fix-local-rspec-tests' into 'master'
Fix local RSpec tests due to bug in `webpack_bundle_tag`
Closes #42368
See merge request gitlab-org/gitlab-ce!16724
| -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 |