kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Resolve CE/EE diff in main.js

See merge request gitlab-org/gitlab-ce!30347
This commit is contained in:
Phil Hughes 2019-07-04 13:19:52 +00:00
commit 000f7ed71f
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/main.js
View file

@ -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;

1
app/assets/javascripts/main_ee.js Normal file
View file

@ -0,0 +1 @@
// This is an empty file to satisfy ee_else_ce import for the EE main entry point