summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-07-29 15:25:59 -0500
committerMike Greiling <mike@pixelcog.com>2019-07-29 16:44:45 -0500
commitb0ba7c72de0a864b01ec1c4be626a8a233a9009f (patch)
treed1e69300285401dead74dca35920363592760b15 /config
parent7d68ac70aa111ab17cfb01e12ace7fa09fedb90b (diff)
downloadgitlab-ce-b0ba7c72de0a864b01ec1c4be626a8a233a9009f.tar.gz
Override icons.svg asset path with sprockets assetmg-update-icons-svg-import
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index f00a9ac0df9..c497a6e88f8 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -89,6 +89,12 @@ const alias = {
// the following resolves files which are different between CE and EE
ee_else_ce: path.join(ROOT_PATH, 'app/assets/javascripts'),
+
+ // override loader path for icons.svg so we do not duplicate this asset
+ '@gitlab/svgs/dist/icons.svg': path.join(
+ ROOT_PATH,
+ 'app/assets/javascripts/lib/utils/icons_path.js',
+ ),
};
if (IS_EE) {