From 253b88e325e4b22b70af7cf936c19c1dbd6a54b8 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 14 Jan 2019 17:37:49 +0100
Subject: Add ee_else_ce alias to Webpack config

(cherry picked from commit da3cd00f5a31f762eb67c2824233ad2b275b2ba8)

Conflicts:
	config/webpack.config.js
---
 config/webpack.config.js | 3 +++
 1 file changed, 3 insertions(+)

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'),
     },
   },
 
-- 
cgit v1.2.1