Commit 62b62bb9 authored by Phil Hughes's avatar Phil Hughes

Merge branch '12368-main-js-ee' into 'master'

Resolve CE/EE diff in main.js

Closes #12368

See merge request gitlab-org/gitlab-ee!14553
parents 3b738536 15b62de9
......@@ -33,8 +33,7 @@ import GlFieldErrors from './gl_field_errors';
import initUserPopovers from './user_popovers';
import { __ } from './locale';
// EE-only scripts
import 'ee/main';
import 'ee_else_ce/main_ee';
// expose jQuery as global (TODO: remove these)
window.jQuery = jQuery;
......
// This is an empty file to satisfy ee_else_ce import for the EE main entry point
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment