Commit 000f7ed7 authored by Phil Hughes's avatar Phil Hughes

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

Resolve CE/EE diff in main.js

See merge request gitlab-org/gitlab-ce!30347
parents bae43725 0e4cef85
......@@ -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;
......
// 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