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

Merge branch 'fix-local-rspec-tests' into 'master'
8e3f40f7 · Mike Greiling · 766d3b9d · 8210d2eb · 8e3f40f7
Commit 8e3f40f7 authored Jan 26, 2018 by Mike Greiling
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

webpack_helper.rb app/helpers/webpack_helper.rb +1 -1

No files found.
--- 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