diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-05-06 01:19:04 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-05-06 01:21:13 -0500 |
commit | b5983a700e66b4fa3ab2f419d4b21a4536443a3d (patch) | |
tree | 5583e98e763742a8fc4164df1436ee2828ba2628 /app | |
parent | de07384b8efcaee51edcf09f89e89f6c9ee7741a (diff) | |
download | gitlab-ce-b5983a700e66b4fa3ab2f419d4b21a4536443a3d.tar.gz |
consolidate main bootstrap entries
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/main.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index ba3ec86d9fd..247aeb481c6 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -1,22 +1,19 @@ -/* eslint-disable import/first */ /* global $ */ import jQuery from 'jquery'; import Cookies from 'js-cookie'; import svg4everybody from 'svg4everybody'; -// expose common libraries as globals (TODO: remove these) -window.jQuery = jQuery; -window.$ = jQuery; +// bootstrap webpack, common libs, polyfills, and behaviors +import './webpack'; +import './commons'; +import './behaviors'; // lib/utils import { handleLocationHash, addSelectOnFocusBehaviour } from './lib/utils/common_utils'; import { localTimeAgo } from './lib/utils/datetime_utility'; import { getLocationHash, visitUrl } from './lib/utils/url_utility'; -// behaviors -import './behaviors/'; - // everything else import loadAwardsHandler from './awards_handler'; import bp from './breakpoints'; @@ -31,9 +28,12 @@ import initLogoAnimation from './logo'; import './milestone_select'; import './projects_dropdown'; import initBreadcrumbs from './breadcrumb'; - import initDispatcher from './dispatcher'; +// expose jQuery as global (TODO: remove these) +window.jQuery = jQuery; +window.$ = jQuery; + // inject test utilities if necessary if (process.env.NODE_ENV !== 'production' && gon && gon.test_env) { $.fx.off = true; |