Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 18 deletions

diff --git a/app/assets/javascripts/super_sidebar/components/user_menu.vue b/app/assets/javascripts/super_sidebar/components/user_menu.vue
index 891e883b6c0..5712b716f48 100644
--- a/app/assets/javascripts/super_sidebar/components/user_menu.vue
+++ b/app/assets/javascripts/super_sidebar/components/user_menu.vue
@@ -8,7 +8,6 @@ import {
 } from '@gitlab/ui';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { s__, __, sprintf } from '~/locale';
-import NewNavToggle from '~/nav/components/new_nav_toggle.vue';
 import Tracking from '~/tracking';
 import PersistentUserCallout from '~/persistent_user_callout';
 import { USER_MENU_TRACKING_DEFAULTS, DROPDOWN_Y_OFFSET, IMPERSONATING_OFFSET } from '../constants';
@@ -39,14 +38,13 @@ export default {
     GlDisclosureDropdownGroup,
     GlDisclosureDropdownItem,
     GlButton,
-    NewNavToggle,
     UserMenuProfileItem,
   },
   directives: {
     SafeHtml,
   },
   mixins: [Tracking.mixin()],
-  inject: ['toggleNewNavEndpoint', 'isImpersonating'],
+  inject: ['isImpersonating'],
   props: {
     data: {
       required: true,
@@ -301,13 +299,6 @@ export default {
         />
       </gl-disclosure-dropdown-group>
 
-      <gl-disclosure-dropdown-group bordered>
-        <template #group-label>
-          <span class="gl-font-sm">{{ $options.i18n.newNavigation.sectionTitle }}</span>
-        </template>
-        <new-nav-toggle :endpoint="toggleNewNavEndpoint" enabled new-navigation />
-      </gl-disclosure-dropdown-group>
-
       <gl-disclosure-dropdown-group
         v-if="data.can_sign_out"
         bordered
diff --git a/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js b/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js
index d0d98ef3808..9e540175b48 100644
--- a/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js
+++ b/app/assets/javascripts/super_sidebar/super_sidebar_bundle.js
@@ -66,13 +66,7 @@ export const initSuperSidebar = () => {
 
   if (!el) return false;
 
-  const {
-    rootPath,
-    sidebar,
-    toggleNewNavEndpoint,
-    forceDesktopExpandedSidebar,
-    commandPalette,
-  } = el.dataset;
+  const { rootPath, sidebar, forceDesktopExpandedSidebar, commandPalette } = el.dataset;
 
   bindSuperSidebarCollapsedEvents(forceDesktopExpandedSidebar);
   initSuperSidebarCollapsedState(parseBoolean(forceDesktopExpandedSidebar));
@@ -98,7 +92,6 @@ export const initSuperSidebar = () => {
     name: 'SuperSidebarRoot',
     provide: {
       rootPath,
-      toggleNewNavEndpoint,
       isImpersonating,
       ...getTrialStatusWidgetData(sidebarData),
       commandPaletteCommands,