Resolved conflictsmove-project-dropdown

1 files changed, 2 insertions, 3 deletions

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 4cc7ff05b60..9fcc0de4e93 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -42,7 +42,7 @@ import './gl_dropdown';
 import initTodoToggle from './header';
 import conditionallyLoadProjectDropdown from './projects_dropdown_loader';
 import initImporterStatus from './importer_status';
-import './layout_nav';
+import initLayoutNav from './layout_nav';
 import LazyLoader from './lazy_loader';
 import './line_highlighter';
 import initLogoAnimation from './logo';
@@ -89,6 +89,7 @@ $(function () {
   var fitSidebarForSize;
 
   initBreadcrumbs();
+  initLayoutNav();
   initImporterStatus();
   initTodoToggle();
   initLogoAnimation();
@@ -262,8 +263,6 @@ $(function () {
 
   renderTimeago();
 
-  $(document).trigger('init.scrolling-tabs');
-
   $('form.filter-form').on('submit', function (event) {
     const link = document.createElement('a');
     link.href = this.action;