Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 2 insertions, 15 deletions

diff --git a/app/assets/javascripts/ide/components/panes/right.vue b/app/assets/javascripts/ide/components/panes/right.vue
index c74a5052573..da2d4fbe7f0 100644
--- a/app/assets/javascripts/ide/components/panes/right.vue
+++ b/app/assets/javascripts/ide/components/panes/right.vue
@@ -7,7 +7,6 @@ import PipelinesList from '../pipelines/list.vue';
 import Clientside from '../preview/clientside.vue';
 import ResizablePanel from '../resizable_panel.vue';
 import TerminalView from '../terminal/view.vue';
-import SwitchEditorsView from '../switch_editors/switch_editors_view.vue';
 import CollapsibleSidebar from './collapsible_sidebar.vue';
 
 // Need to add the width of the nav buttons since the resizable container contains those as well
@@ -21,7 +20,7 @@ export default {
   },
   computed: {
     ...mapState('terminal', { isTerminalVisible: 'isVisible' }),
-    ...mapState(['currentMergeRequestId', 'clientsidePreviewEnabled', 'canUseNewWebIde']),
+    ...mapState(['currentMergeRequestId', 'clientsidePreviewEnabled']),
     ...mapGetters(['packageJson']),
     ...mapState('rightPane', ['isOpen']),
     showLivePreview() {
@@ -30,12 +29,6 @@ export default {
     rightExtensionTabs() {
       return [
         {
-          show: this.canUseNewWebIde,
-          title: __('Switch editors'),
-          views: [{ component: SwitchEditorsView, ...rightSidebarViews.switchEditors }],
-          icon: 'bullhorn',
-        },
-        {
           show: true,
           title: __('Pipelines'),
           views: [
@@ -60,7 +53,6 @@ export default {
     },
   },
   WIDTH,
-  SWITCH_EDITORS_VIEW_NAME: rightSidebarViews.switchEditors.name,
 };
 </script>
 
@@ -72,11 +64,6 @@ export default {
     :min-size="$options.WIDTH"
     :resizable="isOpen"
   >
-    <collapsible-sidebar
-      class="gl-w-full"
-      :extension-tabs="rightExtensionTabs"
-      :init-open-view="$options.SWITCH_EDITORS_VIEW_NAME"
-      side="right"
-    />
+    <collapsible-sidebar class="gl-w-full" :extension-tabs="rightExtensionTabs" side="right" />
   </resizable-panel>
 </template>