summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/main.js
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-11-01 12:32:15 +0000
committerPhil Hughes <me@iamphill.com>2017-11-01 12:32:15 +0000
commit1fc4e2b6c6f523b42397e681657fcb07d5a42cae (patch)
tree3e018b74ad596c3990531447d39fbf4234125dd7 /app/assets/javascripts/main.js
parentb6e69673fdb9083f3e57a5ce0bbd101e603d21c1 (diff)
downloadgitlab-ce-1fc4e2b6c6f523b42397e681657fcb07d5a42cae.tar.gz
Export logo and labels select as ES6 modules
Diffstat (limited to 'app/assets/javascripts/main.js')
-rw-r--r--app/assets/javascripts/main.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index dae3a9e4f49..9117f033c9f 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -55,11 +55,10 @@ import './gl_field_errors';
import './gl_form';
import initTodoToggle from './header';
import initImporterStatus from './importer_status';
-import './labels_select';
import './layout_nav';
import LazyLoader from './lazy_loader';
import './line_highlighter';
-import './logo';
+import initLogoAnimation from './logo';
import './merge_request';
import './merge_request_tabs';
import './milestone';
@@ -134,6 +133,7 @@ $(function () {
initBreadcrumbs();
initImporterStatus();
initTodoToggle();
+ initLogoAnimation();
// Set the default path for all cookies to GitLab's root directory
Cookies.defaults.path = gon.relative_url_root || '/';