diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 03:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 03:08:47 +0300 |
| commit | 66ce6a78f6203652c34bd0532b63c394d5394cc4 (patch) | |
| tree | 67408e003b1c4136bb8e35c1e9ac049563c1f1d5 /config/webpack.config.js | |
| parent | 1c23b3f1315ba1da3c3765acd34feb5c05bc7704 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 2 |
1 files changed, 2 insertions, 0 deletions
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'), }); } |