From 0e4cef8589e36d22e5da125e1fe83475f1b27856 Mon Sep 17 00:00:00 2001
From: Lukas Eipert <leipert@gitlab.com>
Date: Thu, 4 Jul 2019 12:18:51 +0200
Subject: [PATCH] Resolve CE/EE diff in main.js

Moving ee/main.js to ee/main_ee.js allows to add a noop file in CE and
utilize ee_else_ce.
---
 app/assets/javascripts/main.js    | 2 ++
 app/assets/javascripts/main_ee.js | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 app/assets/javascripts/main_ee.js

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 9f30a989295..7b42f267890 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -33,6 +33,8 @@ import GlFieldErrors from './gl_field_errors';
 import initUserPopovers from './user_popovers';
 import { __ } from './locale';
 
+import 'ee_else_ce/main_ee';
+
 // expose jQuery as global (TODO: remove these)
 window.jQuery = jQuery;
 window.$ = jQuery;
diff --git a/app/assets/javascripts/main_ee.js b/app/assets/javascripts/main_ee.js
new file mode 100644
index 00000000000..84d74775163
--- /dev/null
+++ b/app/assets/javascripts/main_ee.js
@@ -0,0 +1 @@
+// This is an empty file to satisfy ee_else_ce import for the EE main entry point