From 66ce6a78f6203652c34bd0532b63c394d5394cc4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 22 Jan 2020 00:08:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/webpack.config.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/webpack.config.js') diff --git a/config/webpack.config.js b/config/webpack.config.js index 7da7e571d67..639de770fd8 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -92,6 +92,7 @@ const alias = { vendor: path.join(ROOT_PATH, 'vendor/assets/javascripts'), vue$: 'vue/dist/vue.esm.js', spec: path.join(ROOT_PATH, 'spec/javascripts'), + jest: path.join(ROOT_PATH, 'spec/frontend'), // the following resolves files which are different between CE and EE ee_else_ce: path.join(ROOT_PATH, 'app/assets/javascripts'), @@ -111,6 +112,7 @@ if (IS_EE) { ee_icons: path.join(ROOT_PATH, 'ee/app/views/shared/icons'), ee_images: path.join(ROOT_PATH, 'ee/app/assets/images'), ee_spec: path.join(ROOT_PATH, 'ee/spec/javascripts'), + ee_jest: path.join(ROOT_PATH, 'ee/spec/frontend'), ee_else_ce: path.join(ROOT_PATH, 'ee/app/assets/javascripts'), }); } -- cgit v1.2.3