Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-26

c9dd2431 · GitLab Bot · f99be399 · 8e3f40f7 · c9dd2431
Commit c9dd2431 authored Jan 26, 2018 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/helpers/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