summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-05-07 11:19:54 -0500
committerMike Greiling <mike@pixelcog.com>2018-05-07 11:19:54 -0500
commitd6cd6e9dc69e7a1440dbc8c5b1c15489a68ed51b (patch)
tree851eff156c3c179663c4902dcea71b43a7bc3805
parentb5983a700e66b4fa3ab2f419d4b21a4536443a3d (diff)
downloadgitlab-ce-d6cd6e9dc69e7a1440dbc8c5b1c15489a68ed51b.tar.gz
add webpack_ prefix to entrypoint paths helper
-rw-r--r--app/helpers/webpack_helper.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/webpack_helper.rb b/app/helpers/webpack_helper.rb
index 01264f53a40..e12e4ba70e9 100644
--- a/app/helpers/webpack_helper.rb
+++ b/app/helpers/webpack_helper.rb
@@ -2,7 +2,7 @@ require 'gitlab/webpack/manifest'
module WebpackHelper
def webpack_bundle_tag(bundle)
- javascript_include_tag(*entrypoint_paths(bundle))
+ javascript_include_tag(*webpack_entrypoint_paths(bundle))
end
def webpack_controller_bundle_tags
@@ -19,7 +19,7 @@ module WebpackHelper
until chunks.any? || route.empty?
entrypoint = "pages.#{route.join('.')}"
begin
- chunks = entrypoint_paths(entrypoint, extension: 'js')
+ chunks = webpack_entrypoint_paths(entrypoint, extension: 'js')
rescue Gitlab::Webpack::Manifest::AssetMissingError
# no bundle exists for this path
end
@@ -27,13 +27,13 @@ module WebpackHelper
end
if chunks.empty?
- chunks = entrypoint_paths("default", extension: 'js')
+ chunks = webpack_entrypoint_paths("default", extension: 'js')
end
javascript_include_tag(*chunks)
end
- def entrypoint_paths(source, extension: nil, exclude_duplicates: true)
+ def webpack_entrypoint_paths(source, extension: nil, exclude_duplicates: true)
return "" unless source.present?
paths = Gitlab::Webpack::Manifest.entrypoint_paths(source)