diff options
| author | Phil Hughes <me@iamphill.com> | 2019-07-04 13:19:52 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-04 13:19:52 +0000 |
| commit | 000f7ed71f3a87c1361b9a64c1fd7f6a54666392 (patch) | |
| tree | 607624c222ed3c17fd3f5fe0fc1c939db3c247e3 | |
| parent | bae437254d7d35a63ceab8e7f980fb1b30933436 (diff) | |
| parent | 0e4cef8589e36d22e5da125e1fe83475f1b27856 (diff) | |
| download | gitlab-ce-000f7ed71f3a87c1361b9a64c1fd7f6a54666392.tar.gz | |
Merge branch '12368-main-js' into 'master'
Resolve CE/EE diff in main.js
See merge request gitlab-org/gitlab-ce!30347
| -rw-r--r-- | app/assets/javascripts/main.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/main_ee.js | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 2d32e6a7fbb..9e97f345717 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 |