diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 18:09:20 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 18:09:20 +0000 |
commit | 835f1214dcc4e08e3076f269b7b2aa854ea4257a (patch) | |
tree | 07366d250301a8b2a8d7f24d220f4db21b5f6f59 /app/assets/javascripts/main.js | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) | |
download | gitlab-ce-835f1214dcc4e08e3076f269b7b2aa854ea4257a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/main.js')
-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 71dffe744fb..b5596e257f3 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -12,8 +12,12 @@ import './behaviors'; import applyGitLabUIConfig from '@gitlab/ui/dist/config'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; import { initRails } from '~/lib/utils/rails_ujs'; -import * as tooltips from '~/tooltips'; import * as popovers from '~/popovers'; +import * as tooltips from '~/tooltips'; +import initAlertHandler from './alert_handler'; +import { deprecatedCreateFlash as Flash, removeFlashClickListener } from './flash'; +import initTodoToggle from './header'; +import initLayoutNav from './layout_nav'; import { handleLocationHash, addSelectOnFocusBehaviour, @@ -23,22 +27,18 @@ import { localTimeAgo } from './lib/utils/datetime_utility'; import { getLocationHash, visitUrl } from './lib/utils/url_utility'; // everything else -import { deprecatedCreateFlash as Flash, removeFlashClickListener } from './flash'; -import initTodoToggle from './header'; -import initLayoutNav from './layout_nav'; -import initAlertHandler from './alert_handler'; import './feature_highlight/feature_highlight_options'; import LazyLoader from './lazy_loader'; +import { __ } from './locale'; import initLogoAnimation from './logo'; import initFrequentItemDropdowns from './frequent_items'; import initBreadcrumbs from './breadcrumb'; +import initPersistentUserCallouts from './persistent_user_callouts'; +import { initUserTracking, initDefaultTrackers } from './tracking'; import initUsagePingConsent from './usage_ping_consent'; import GlFieldErrors from './gl_field_errors'; import initUserPopovers from './user_popovers'; import initBroadcastNotifications from './broadcast_notification'; -import initPersistentUserCallouts from './persistent_user_callouts'; -import { initUserTracking, initDefaultTrackers } from './tracking'; -import { __ } from './locale'; import 'ee_else_ce/main_ee'; |