Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

1 files changed, 4 insertions, 10 deletions

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 4c715c4993f..fd002e29afc 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -89,9 +89,11 @@ initRails();
 function deferredInitialisation() {
   const $body = $('body');
 
-  initTopNav();
+  if (!gon.use_new_navigation) {
+    initTopNav();
+    initTodoToggle();
+  }
   initBreadcrumbs();
-  initTodoToggle();
   initPrefetchLinks('.js-prefetch-document');
   initLogoAnimation();
   initServicePingConsent();
@@ -104,14 +106,6 @@ function deferredInitialisation() {
   initCopyCodeButton();
   initGitlabVersionCheck();
 
-  // Init super sidebar
-  if (gon.use_new_navigation) {
-    // eslint-disable-next-line promise/catch-or-return
-    import('./super_sidebar/super_sidebar_bundle').then(({ initSuperSidebar }) => {
-      initSuperSidebar();
-    });
-  }
-
   addSelectOnFocusBehaviour('.js-select-on-focus');
 
   const glTooltipDelay = localStorage.getItem('gl-tooltip-delay');