diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-31 05:47:47 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-01-31 05:47:47 +0000 |
| commit | dd1348bd90d57b4a68280aed0716d22848ede77e (patch) | |
| tree | be2c398fb125f32ae24bbc6d340af38362716533 /config/webpack.config.js | |
| parent | f60bf03f5cc4cb6eab9348d852fc4d0fa60c5650 (diff) | |
| parent | 71cc198fc73c379e9b6edcf6c84578aab8545a05 (diff) | |
| download | gitlab-ce-dd1348bd90d57b4a68280aed0716d22848ede77e.tar.gz | |
Merge branch 'winh-ee-switch' into 'master'
Use ee_else_ce alias to resolve merge request widget files
See merge request gitlab-org/gitlab-ce!24374
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index b9044e13f50..fdf179b007a 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -94,6 +94,9 @@ module.exports = { vendor: path.join(ROOT_PATH, 'vendor/assets/javascripts'), vue$: 'vue/dist/vue.esm.js', spec: path.join(ROOT_PATH, 'spec/javascripts'), + + // the following resolves files which are different between CE and EE + ee_else_ce: path.join(ROOT_PATH, 'app/assets/javascripts'), }, }, |