diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-01-26 01:12:11 +0000 |
|---|---|---|
| committer | Ian Baum <ibaum@gitlab.com> | 2018-01-29 12:13:10 -0600 |
| commit | a655f1d9a39bd4d21af8dd1ce2276e24caa09dc6 (patch) | |
| tree | 5c2350261a7cbbaad2ea28d61ee13b9626d5c049 | |
| parent | 44cb95a471031773190dd7912529df47e27a767b (diff) | |
| download | gitlab-ce-a655f1d9a39bd4d21af8dd1ce2276e24caa09dc6.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 |