summaryrefslogtreecommitdiff
path: root/app/helpers/javascript_helper.rb
diff options
context:
space:
mode:
authorMike Greiling <mgreiling@gitlab.com>2017-04-12 19:05:23 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2017-04-12 19:05:23 +0000
commit10deca824ed55d642ba942d21df768d9c1a376bc (patch)
tree88d7b7b2211140e15796d23d7da7c80278517af5 /app/helpers/javascript_helper.rb
parentc68ea29d5dcaa9a5ab00aaf49cbcc65d7ce98c6d (diff)
downloadgitlab-ce-10deca824ed55d642ba942d21df768d9c1a376bc.tar.gz
Improve webpack-dev-server compatibility with non-localhost setups.
Diffstat (limited to 'app/helpers/javascript_helper.rb')
-rw-r--r--app/helpers/javascript_helper.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/helpers/javascript_helper.rb b/app/helpers/javascript_helper.rb
index 68c09c922a6..d5e77c7e271 100644
--- a/app/helpers/javascript_helper.rb
+++ b/app/helpers/javascript_helper.rb
@@ -3,7 +3,8 @@ module JavascriptHelper
javascript_include_tag asset_path(js)
end
- def page_specific_javascript_bundle_tag(js)
- javascript_include_tag(*webpack_asset_paths(js))
+ # deprecated; use webpack_bundle_tag directly instead
+ def page_specific_javascript_bundle_tag(bundle)
+ webpack_bundle_tag(bundle)
end
end