From d6cd6e9dc69e7a1440dbc8c5b1c15489a68ed51b Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Mon, 7 May 2018 11:19:54 -0500 Subject: [PATCH] add webpack_ prefix to entrypoint paths helper --- app/helpers/webpack_helper.rb | 8 ++++---- 1 file 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)