diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2019-01-14 17:37:49 +0100 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2019-01-30 14:40:34 +0100 |
| commit | 253b88e325e4b22b70af7cf936c19c1dbd6a54b8 (patch) | |
| tree | 882ce77eaf775b66b31335c6fe92d9e9cc118539 | |
| parent | 143975841cc47ce775e6b0d8c58517953cfc92fa (diff) | |
| download | gitlab-ce-253b88e325e4b22b70af7cf936c19c1dbd6a54b8.tar.gz | |
Add ee_else_ce alias to Webpack config
(cherry picked from commit da3cd00f5a31f762eb67c2824233ad2b275b2ba8)
Conflicts:
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'), }, }, |