Add latest changes from gitlab-org/gitlab@master

26 files changed, 176 insertions, 414 deletions

diff --git a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
index 5b01d15a099..11b3a5a3069 100644
--- a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
+++ b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue
@@ -1,5 +1,4 @@
 <script>
-import { GlTabs, GlTab } from '@gitlab/ui';
 import trackUIControl from '../services/track_ui_control';
 import ToolbarButton from './toolbar_button.vue';
 import ToolbarAttachmentButton from './toolbar_attachment_button.vue';
@@ -10,8 +9,6 @@ import ToolbarMoreDropdown from './toolbar_more_dropdown.vue';
 
 export default {
   components: {
-    GlTabs,
-    GlTab,
     ToolbarButton,
     ToolbarTextStyleDropdown,
     ToolbarLinkButton,
@@ -27,83 +24,77 @@ export default {
 };
 </script>
 <template>
-  <gl-tabs content-class="gl-display-none">
-    <gl-tab title-link-class="gl-py-4 gl-px-3" :title="__('Write')" />
-    <template #tabs-end>
-      <div class="gl-ml-auto gl-py-2 gl-display-flex gl-flex-wrap-wrap gl-align-items-end">
-        <toolbar-text-style-dropdown
-          data-testid="text-styles"
-          @execute="trackToolbarControlExecution"
-        />
-        <toolbar-button
-          data-testid="bold"
-          content-type="bold"
-          icon-name="bold"
-          editor-command="toggleBold"
-          :label="__('Bold text')"
-          @execute="trackToolbarControlExecution"
-        />
-        <toolbar-button
-          data-testid="italic"
-          content-type="italic"
-          icon-name="italic"
-          editor-command="toggleItalic"
-          :label="__('Italic text')"
-          @execute="trackToolbarControlExecution"
-        />
-        <toolbar-button
-          data-testid="blockquote"
-          content-type="blockquote"
-          icon-name="quote"
-          editor-command="toggleBlockquote"
-          :label="__('Insert a quote')"
-          @execute="trackToolbarControlExecution"
-        />
-        <toolbar-button
-          data-testid="code"
-          content-type="code"
-          icon-name="code"
-          editor-command="toggleCode"
-          :label="__('Code')"
-          @execute="trackToolbarControlExecution"
-        />
-        <toolbar-link-button data-testid="link" @execute="trackToolbarControlExecution" />
-        <toolbar-button
-          data-testid="bullet-list"
-          content-type="bulletList"
-          icon-name="list-bulleted"
-          class="gl-display-none gl-sm-display-inline"
-          editor-command="toggleBulletList"
-          :label="__('Add a bullet list')"
-          @execute="trackToolbarControlExecution"
-        />
-        <toolbar-button
-          data-testid="ordered-list"
-          content-type="orderedList"
-          icon-name="list-numbered"
-          class="gl-display-none gl-sm-display-inline"
-          editor-command="toggleOrderedList"
-          :label="__('Add a numbered list')"
-          @execute="trackToolbarControlExecution"
-        />
-        <toolbar-button
-          data-testid="task-list"
-          content-type="taskList"
-          icon-name="list-task"
-          class="gl-display-none gl-sm-display-inline"
-          editor-command="toggleTaskList"
-          :label="__('Add a checklist')"
-          @execute="trackToolbarControlExecution"
-        />
-        <toolbar-table-button data-testid="table" @execute="trackToolbarControlExecution" />
-        <toolbar-attachment-button
-          data-testid="attachment"
-          @execute="trackToolbarControlExecution"
-        />
-        <toolbar-more-dropdown data-testid="more" @execute="trackToolbarControlExecution" />
-      </div>
-    </template>
-  </gl-tabs>
+  <div class="gl-w-full gl-border-b gl-display-flex gl-justify-content-end">
+    <div class="gl-py-2 gl-display-flex gl-flex-wrap-wrap gl-align-items-end">
+      <toolbar-text-style-dropdown
+        data-testid="text-styles"
+        @execute="trackToolbarControlExecution"
+      />
+      <toolbar-button
+        data-testid="bold"
+        content-type="bold"
+        icon-name="bold"
+        editor-command="toggleBold"
+        :label="__('Bold text')"
+        @execute="trackToolbarControlExecution"
+      />
+      <toolbar-button
+        data-testid="italic"
+        content-type="italic"
+        icon-name="italic"
+        editor-command="toggleItalic"
+        :label="__('Italic text')"
+        @execute="trackToolbarControlExecution"
+      />
+      <toolbar-button
+        data-testid="blockquote"
+        content-type="blockquote"
+        icon-name="quote"
+        editor-command="toggleBlockquote"
+        :label="__('Insert a quote')"
+        @execute="trackToolbarControlExecution"
+      />
+      <toolbar-button
+        data-testid="code"
+        content-type="code"
+        icon-name="code"
+        editor-command="toggleCode"
+        :label="__('Code')"
+        @execute="trackToolbarControlExecution"
+      />
+      <toolbar-link-button data-testid="link" @execute="trackToolbarControlExecution" />
+      <toolbar-button
+        data-testid="bullet-list"
+        content-type="bulletList"
+        icon-name="list-bulleted"
+        class="gl-display-none gl-sm-display-inline"
+        editor-command="toggleBulletList"
+        :label="__('Add a bullet list')"
+        @execute="trackToolbarControlExecution"
+      />
+      <toolbar-button
+        data-testid="ordered-list"
+        content-type="orderedList"
+        icon-name="list-numbered"
+        class="gl-display-none gl-sm-display-inline"
+        editor-command="toggleOrderedList"
+        :label="__('Add a numbered list')"
+        @execute="trackToolbarControlExecution"
+      />
+      <toolbar-button
+        data-testid="task-list"
+        content-type="taskList"
+        icon-name="list-task"
+        class="gl-display-none gl-sm-display-inline"
+        editor-command="toggleTaskList"
+        :label="__('Add a checklist')"
+        @execute="trackToolbarControlExecution"
+      />
+      <toolbar-table-button data-testid="table" @execute="trackToolbarControlExecution" />
+      <toolbar-attachment-button data-testid="attachment" @execute="trackToolbarControlExecution" />
+      <toolbar-more-dropdown data-testid="more" @execute="trackToolbarControlExecution" />
+    </div>
+  </div>
 </template>
 <style>
 .gl-spinner-container {
diff --git a/app/assets/javascripts/issues/constants.js b/app/assets/javascripts/issues/constants.js
index 371db4eacc3..d35355a8f26 100644
--- a/app/assets/javascripts/issues/constants.js
+++ b/app/assets/javascripts/issues/constants.js
@@ -26,8 +26,3 @@ export const IssuableStatusText = {
   [STATUS_MERGED]: __('Merged'),
   [STATUS_LOCKED]: __('Open'),
 };
-
-export const IssuableTypeText = {
-  [TYPE_ISSUE]: __('issue'),
-  [TYPE_MERGE_REQUEST]: __('merge request'),
-};
diff --git a/app/assets/javascripts/issues/show/components/header_actions.vue b/app/assets/javascripts/issues/show/components/header_actions.vue
index b929c4dbae0..84def374d13 100644
--- a/app/assets/javascripts/issues/show/components/header_actions.vue
+++ b/app/assets/javascripts/issues/show/components/header_actions.vue
@@ -2,36 +2,23 @@
 import {
   GlButton,
   GlDropdown,
-  GlDropdownDivider,
   GlDropdownItem,
   GlLink,
   GlModal,
   GlModalDirective,
   GlTooltipDirective,
 } from '@gitlab/ui';
-import * as Sentry from '@sentry/browser';
 import { mapActions, mapGetters, mapState } from 'vuex';
 import { createAlert, VARIANT_SUCCESS } from '~/alert';
 import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants';
-import { STATUS_CLOSED, TYPE_INCIDENT, TYPE_ISSUE, IssuableTypeText } from '~/issues/constants';
-import {
-  ISSUE_STATE_EVENT_CLOSE,
-  ISSUE_STATE_EVENT_REOPEN,
-  NEW_ACTIONS_POPOVER_KEY,
-} from '~/issues/show/constants';
+import { STATUS_CLOSED, TYPE_INCIDENT, TYPE_ISSUE } from '~/issues/constants';
+import { ISSUE_STATE_EVENT_CLOSE, ISSUE_STATE_EVENT_REOPEN } from '~/issues/show/constants';
 import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
-import { getCookie, parseBoolean, setCookie } from '~/lib/utils/common_utils';
 import { visitUrl } from '~/lib/utils/url_utility';
 import { s__, __, sprintf } from '~/locale';
 import eventHub from '~/notes/event_hub';
 import Tracking from '~/tracking';
-import toast from '~/vue_shared/plugins/global_toast';
 import AbuseCategorySelector from '~/abuse_reports/components/abuse_category_selector.vue';
-import NewHeaderActionsPopover from '~/issues/show/components/new_header_actions_popover.vue';
-import SidebarSubscriptionsWidget from '~/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue';
-import IssuableLockForm from '~/sidebar/components/lock/issuable_lock_form.vue';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import issueReferenceQuery from '~/sidebar/queries/issue_reference.query.graphql';
 import issuesEventHub from '../event_hub';
 import promoteToEpicMutation from '../queries/promote_to_epic.mutation.graphql';
 import updateIssueMutation from '../queries/update_issue.mutation.graphql';
@@ -57,27 +44,21 @@ export default {
       'The issue was successfully promoted to an epic. Redirecting to epic...',
     ),
     reportAbuse: __('Report abuse to administrator'),
-    referenceFetchError: __('An error occurred while fetching reference'),
-    copyReferenceText: __('Copy reference'),
   },
   components: {
     DeleteIssueModal,
     GlButton,
     GlDropdown,
-    GlDropdownDivider,
     GlDropdownItem,
     GlLink,
     GlModal,
     AbuseCategorySelector,
-    NewHeaderActionsPopover,
-    SidebarSubscriptionsWidget,
-    IssuableLockForm,
   },
   directives: {
     GlModal: GlModalDirective,
     GlTooltip: GlTooltipDirective,
   },
-  mixins: [trackingMixin, glFeatureFlagMixin()],
+  mixins: [trackingMixin],
   inject: {
     canCreateIssue: {
       default: false,
@@ -124,46 +105,15 @@ export default {
     reportedFromUrl: {
       default: '',
     },
-    issuableEmailAddress: {
-      default: '',
-    },
-    fullPath: {
-      default: '',
-    },
   },
   data() {
     return {
       isReportAbuseDrawerOpen: false,
     };
   },
-  apollo: {
-    issuableReference: {
-      query: issueReferenceQuery,
-      variables() {
-        return {
-          fullPath: this.fullPath,
-          iid: this.iid,
-        };
-      },
-      update(data) {
-        return data.workspace?.issuable?.reference || '';
-      },
-      skip() {
-        return !this.isMrSidebarMoved;
-      },
-      error(error) {
-        createAlert({ message: this.$options.i18n.referenceFetchError });
-        Sentry.captureException(error);
-      },
-    },
-  },
   computed: {
     ...mapState(['isToggleStateButtonLoading']),
     ...mapGetters(['openState', 'getBlockedByIssues']),
-    ...mapGetters(['getNoteableData']),
-    isLocked() {
-      return this.getNoteableData.discussion_locked;
-    },
     isClosed() {
       return this.openState === STATUS_CLOSED;
     },
@@ -207,17 +157,6 @@ export default {
     hasMobileDropdown() {
       return this.hasDesktopDropdown || this.showToggleIssueStateButton;
     },
-    copyMailAddressText() {
-      return sprintf(__('Copy %{issueType} email address'), {
-        issueType: IssuableTypeText[this.issueType],
-      });
-    },
-    isMrSidebarMoved() {
-      return this.glFeatures.movedMrSidebar;
-    },
-    showLockIssueOption() {
-      return this.isMrSidebarMoved && this.issueType === TYPE_ISSUE;
-    },
   },
   created() {
     eventHub.$on('toggle.issuable.state', this.toggleIssueState);
@@ -227,7 +166,6 @@ export default {
   },
   methods: {
     ...mapActions(['toggleStateButtonLoading']),
-    ...mapActions(['updateLockedAttribute']),
     toggleIssueState() {
       if (!this.isClosed && this.getBlockedByIssues?.length) {
         this.$refs.blockedByIssuesModal.show();
@@ -306,19 +244,7 @@ export default {
     edit() {
       issuesEventHub.$emit('open.form');
     },
-    dismissPopover() {
-      if (this.isMrSidebarMoved && !parseBoolean(getCookie(`${NEW_ACTIONS_POPOVER_KEY}`))) {
-        setCookie(NEW_ACTIONS_POPOVER_KEY, true);
-      }
-    },
-    copyReference() {
-      toast(__('Reference copied'));
-    },
-    copyEmailAddress() {
-      toast(__('Email address copied'));
-    },
   },
-  TYPE_ISSUE,
 };
 </script>
 
@@ -333,21 +259,6 @@ export default {
       data-testid="mobile-dropdown"
       :loading="isToggleStateButtonLoading"
     >
-      <template v-if="isMrSidebarMoved">
-        <sidebar-subscriptions-widget
-          :iid="String(iid)"
-          :full-path="fullPath"
-          :issuable-type="$options.TYPE_ISSUE"
-          data-testid="notification-toggle"
-        />
-
-        <gl-dropdown-divider />
-      </template>
-
-      <template v-if="showLockIssueOption">
-        <issuable-lock-form :is-editable="false" data-testid="lock-issue-toggle" />
-      </template>
-
       <gl-dropdown-item v-if="canUpdateIssue" @click="edit">
         {{ $options.i18n.edit }}
       </gl-dropdown-item>
@@ -364,21 +275,9 @@ export default {
       <gl-dropdown-item v-if="canPromoteToEpic" @click="promoteToEpic">
         {{ __('Promote to epic') }}
       </gl-dropdown-item>
-      <template v-if="isMrSidebarMoved">
-        <gl-dropdown-item
-          :data-clipboard-text="issuableReference"
-          data-testid="copy-reference"
-          @click="copyReference"
-          >{{ $options.i18n.copyReferenceText }}</gl-dropdown-item
-        >
-        <gl-dropdown-item
-          v-if="issuableEmailAddress"
-          :data-clipboard-text="issuableEmailAddress"
-          data-testid="copy-email"
-          @click="copyEmailAddress"
-          >{{ copyMailAddressText }}</gl-dropdown-item
-        >
-      </template>
+      <gl-dropdown-item v-if="!isIssueAuthor" @click="toggleReportAbuseDrawer(true)">
+        {{ $options.i18n.reportAbuse }}
+      </gl-dropdown-item>
       <gl-dropdown-item
         v-if="canReportSpam"
         :href="submitAsSpamPath"
@@ -388,7 +287,6 @@ export default {
         {{ __('Submit as spam') }}
       </gl-dropdown-item>
       <template v-if="canDestroyIssue">
-        <gl-dropdown-divider />
         <gl-dropdown-item
           v-gl-modal="$options.deleteModalId"
           variant="danger"
@@ -397,13 +295,6 @@ export default {
           {{ deleteButtonText }}
         </gl-dropdown-item>
       </template>
-      <gl-dropdown-item
-        v-if="!isIssueAuthor"
-        data-testid="report-abuse-item"
-        @click="toggleReportAbuseDrawer(true)"
-      >
-        {{ $options.i18n.reportAbuse }}
-      </gl-dropdown-item>
     </gl-dropdown>
 
     <gl-button
@@ -431,7 +322,6 @@ export default {
 
     <gl-dropdown
       v-if="hasDesktopDropdown"
-      id="new-actions-header-dropdown"
       v-gl-tooltip.hover
       class="gl-display-none gl-sm-display-inline-flex! gl-sm-ml-3"
       icon="ellipsis_v"
@@ -444,19 +334,7 @@ export default {
       data-testid="desktop-dropdown"
       no-caret
       right
-      @shown="dismissPopover"
     >
-      <template v-if="isMrSidebarMoved">
-        <sidebar-subscriptions-widget
-          :iid="String(iid)"
-          :full-path="fullPath"
-          :issuable-type="$options.TYPE_ISSUE"
-          data-testid="notification-toggle"
-        />
-
-        <gl-dropdown-divider />
-      </template>
-
       <gl-dropdown-item v-if="canCreateIssue" :href="newIssuePath">
         {{ newIssueTypeText }}
       </gl-dropdown-item>
@@ -468,24 +346,9 @@ export default {
       >
         {{ __('Promote to epic') }}
       </gl-dropdown-item>
-      <template v-if="showLockIssueOption">
-        <issuable-lock-form :is-editable="false" data-testid="lock-issue-toggle" />
-      </template>
-      <template v-if="isMrSidebarMoved">
-        <gl-dropdown-item
-          :data-clipboard-text="issuableReference"
-          data-testid="copy-reference"
-          @click="copyReference"
-          >{{ $options.i18n.copyReferenceText }}</gl-dropdown-item
-        >
-        <gl-dropdown-item
-          v-if="issuableEmailAddress"
-          :data-clipboard-text="issuableEmailAddress"
-          data-testid="copy-email"
-          @click="copyEmailAddress"
-          >{{ copyMailAddressText }}</gl-dropdown-item
-        >
-      </template>
+      <gl-dropdown-item v-if="!isIssueAuthor" @click="toggleReportAbuseDrawer(true)">
+        {{ $options.i18n.reportAbuse }}
+      </gl-dropdown-item>
       <gl-dropdown-item
         v-if="canReportSpam"
         :href="submitAsSpamPath"
@@ -494,8 +357,8 @@ export default {
       >
         {{ __('Submit as spam') }}
       </gl-dropdown-item>
+
       <template v-if="canDestroyIssue">
-        <gl-dropdown-divider />
         <gl-dropdown-item
           v-gl-modal="$options.deleteModalId"
           variant="danger"
@@ -505,16 +368,8 @@ export default {
           {{ deleteButtonText }}
         </gl-dropdown-item>
       </template>
-      <gl-dropdown-item
-        v-if="!isIssueAuthor"
-        data-testid="report-abuse-item"
-        @click="toggleReportAbuseDrawer(true)"
-      >
-        {{ $options.i18n.reportAbuse }}
-      </gl-dropdown-item>
     </gl-dropdown>
 
-    <new-header-actions-popover v-if="isMrSidebarMoved" :issue-type="issueType" />
     <gl-modal
       ref="blockedByIssuesModal"
       modal-id="blocked-by-issues-modal"
diff --git a/app/assets/javascripts/issues/show/components/new_header_actions_popover.vue b/app/assets/javascripts/issues/show/components/new_header_actions_popover.vue
deleted file mode 100644
index 975661c7d32..00000000000
--- a/app/assets/javascripts/issues/show/components/new_header_actions_popover.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<script>
-import { GlPopover, GlButton } from '@gitlab/ui';
-import { s__, sprintf } from '~/locale';
-import { getCookie, parseBoolean, setCookie } from '~/lib/utils/common_utils';
-import { NEW_ACTIONS_POPOVER_KEY } from '~/issues/show/constants';
-import { IssuableTypeText } from '~/issues/constants';
-
-export default {
-  name: 'NewHeaderActionsPopover',
-  i18n: {
-    popoverText: s__(
-      'HeaderAction|Notifications and other %{issueType} actions have moved to this menu.',
-    ),
-    confirmButtonText: s__('HeaderAction|Okay!'),
-  },
-  components: {
-    GlPopover,
-    GlButton,
-  },
-  props: {
-    issueType: {
-      type: String,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      dismissKey: NEW_ACTIONS_POPOVER_KEY,
-      popoverDismissed: parseBoolean(getCookie(`${NEW_ACTIONS_POPOVER_KEY}`)),
-    };
-  },
-  computed: {
-    popoverText() {
-      return sprintf(this.$options.i18n.popoverText, {
-        issueType: IssuableTypeText[this.issueType],
-      });
-    },
-    showPopover() {
-      return !this.popoverDismissed;
-    },
-  },
-  methods: {
-    dismissPopover() {
-      this.popoverDismissed = true;
-      setCookie(this.dismissKey, this.popoverDismissed);
-    },
-  },
-};
-</script>
-
-<template>
-  <div>
-    <gl-popover
-      v-if="showPopover"
-      target="new-actions-header-dropdown"
-      container="viewport"
-      placement="left"
-      :show="showPopover"
-      triggers="manual"
-      content="text"
-      :css-classes="['gl-p-2 new-header-popover']"
-    >
-      <template #title>
-        <div class="gl-font-base gl-font-weight-normal">
-          {{ popoverText }}
-        </div>
-      </template>
-      <gl-button
-        data-testid="confirm-button"
-        variant="confirm"
-        type="submit"
-        @click="dismissPopover"
-        >{{ $options.i18n.confirmButtonText }}</gl-button
-      >
-    </gl-popover>
-  </div>
-</template>
diff --git a/app/assets/javascripts/issues/show/constants.js b/app/assets/javascripts/issues/show/constants.js
index 6320e4ef266..4d8c11f9669 100644
--- a/app/assets/javascripts/issues/show/constants.js
+++ b/app/assets/javascripts/issues/show/constants.js
@@ -17,5 +17,3 @@ export const issueState = {
   issueType: undefined,
   isDirty: false,
 };
-
-export const NEW_ACTIONS_POPOVER_KEY = 'new-actions-popover-viewed';
diff --git a/app/assets/javascripts/issues/show/index.js b/app/assets/javascripts/issues/show/index.js
index 100abcbe1e5..e677328cd2e 100644
--- a/app/assets/javascripts/issues/show/index.js
+++ b/app/assets/javascripts/issues/show/index.js
@@ -174,8 +174,6 @@ export function initHeaderActions(store, type = '') {
       reportedUserId: parseInt(el.dataset.reportedUserId, 10),
       reportedFromUrl: el.dataset.reportedFromUrl,
       submitAsSpamPath: el.dataset.submitAsSpamPath,
-      issuableEmailAddress: el.dataset.issuableEmailAddress,
-      fullPath: el.dataset.projectPath,
     },
     render: (createElement) => createElement(HeaderActions),
   });
diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js
index 58e4553d00d..297b8ae1fc2 100644
--- a/app/assets/javascripts/right_sidebar.js
+++ b/app/assets/javascripts/right_sidebar.js
@@ -56,10 +56,8 @@ Sidebar.prototype.addEventListeners = function () {
     const layoutPage = document.querySelector('.layout-page');
     const rightSidebar = document.querySelector('.js-right-sidebar');
 
-    if (rightSidebar.classList.contains('right-sidebar-merge-requests')) {
-      updateSidebarClasses(layoutPage, rightSidebar);
-      window.addEventListener('resize', () => updateSidebarClasses(layoutPage, rightSidebar));
-    }
+    updateSidebarClasses(layoutPage, rightSidebar);
+    window.addEventListener('resize', () => updateSidebarClasses(layoutPage, rightSidebar));
   }
 };
 
diff --git a/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue b/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue
index 06876546fa4..1eff4db3970 100644
--- a/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue
+++ b/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue
@@ -1,9 +1,8 @@
 <script>
 import { GlIcon, GlTooltipDirective, GlOutsideDirective as Outside } from '@gitlab/ui';
 import { mapGetters, mapActions } from 'vuex';
-import { TYPE_ISSUE } from '~/issues/constants';
+import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/issues/constants';
 import { __, sprintf } from '~/locale';
-import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { createAlert } from '~/alert';
 import toast from '~/vue_shared/plugins/global_toast';
@@ -46,8 +45,10 @@ export default {
   },
   computed: {
     ...mapGetters(['getNoteableData']),
-    isMovedMrSidebar() {
-      return this.glFeatures.movedMrSidebar;
+    isMergeRequest() {
+      return (
+        this.getNoteableData.targetType === TYPE_MERGE_REQUEST && this.glFeatures.movedMrSidebar
+      );
     },
     issuableDisplayName() {
       const isInIssuePage = this.getNoteableData.targetType === TYPE_ISSUE;
@@ -59,6 +60,7 @@ export default {
     lockStatus() {
       return this.isLocked ? this.$options.locked : this.$options.unlocked;
     },
+
     tooltipLabel() {
       return this.isLocked ? __('Locked') : __('Unlocked');
     },
@@ -87,13 +89,8 @@ export default {
         fullPath: this.fullPath,
       })
         .then(() => {
-          if (this.isMovedMrSidebar) {
-            toast(
-              sprintf(__('%{issuableDisplayName} %{lockStatus}.'), {
-                issuableDisplayName: capitalizeFirstCharacter(this.issuableDisplayName),
-                lockStatus: this.isLocked ? __('locked') : __('unlocked'),
-              }),
-            );
+          if (this.isMergeRequest) {
+            toast(this.isLocked ? __('Merge request locked.') : __('Merge request unlocked.'));
           }
         })
         .catch(() => {
@@ -116,14 +113,14 @@ export default {
 </script>
 
 <template>
-  <li v-if="isMovedMrSidebar" class="gl-dropdown-item">
-    <button type="button" class="dropdown-item" data-testid="issuable-lock" @click="toggleLocked">
+  <li v-if="isMergeRequest" class="gl-dropdown-item">
+    <button type="button" class="dropdown-item" @click="toggleLocked">
       <span class="gl-dropdown-item-text-wrapper">
         <template v-if="isLocked">
-          {{ sprintf(__('Unlock %{issuableType}'), { issuableType: issuableDisplayName }) }}
+          {{ __('Unlock merge request') }}
         </template>
         <template v-else>
-          {{ sprintf(__('Lock %{issuableType}'), { issuableType: issuableDisplayName }) }}
+          {{ __('Lock merge request') }}
         </template>
       </span>
     </button>
diff --git a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue
index f2b960ed02c..344fa880131 100644
--- a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue
+++ b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue
@@ -1,7 +1,12 @@
 <script>
 import { GlDropdownForm, GlIcon, GlLoadingIcon, GlToggle, GlTooltipDirective } from '@gitlab/ui';
 import { createAlert } from '~/alert';
-import { TYPE_EPIC, WORKSPACE_GROUP, WORKSPACE_PROJECT } from '~/issues/constants';
+import {
+  TYPE_EPIC,
+  TYPE_MERGE_REQUEST,
+  WORKSPACE_GROUP,
+  WORKSPACE_PROJECT,
+} from '~/issues/constants';
 import { isLoggedIn } from '~/lib/utils/common_utils';
 import { __, sprintf } from '~/locale';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
@@ -86,8 +91,8 @@ export default {
     },
   },
   computed: {
-    isMovedMrSidebar() {
-      return this.glFeatures.movedMrSidebar;
+    isMergeRequest() {
+      return this.issuableType === TYPE_MERGE_REQUEST && this.glFeatures.movedMrSidebar;
     },
     isLoading() {
       return this.$apollo.queries?.subscribed?.loading || this.loading;
@@ -143,7 +148,7 @@ export default {
               });
             }
 
-            if (this.isMovedMrSidebar) {
+            if (this.isMergeRequest) {
               toast(subscribed ? __('Notifications turned on.') : __('Notifications turned off.'));
             }
           },
@@ -182,7 +187,7 @@ export default {
 </script>
 
 <template>
-  <gl-dropdown-form v-if="isMovedMrSidebar" class="gl-dropdown-item">
+  <gl-dropdown-form v-if="isMergeRequest" class="gl-dropdown-item">
     <div class="gl-px-5 gl-pb-2 gl-pt-1">
       <gl-toggle
         :value="subscribed"
diff --git a/app/assets/javascripts/sidebar/mount_sidebar.js b/app/assets/javascripts/sidebar/mount_sidebar.js
index 1542c2e441d..2c56dc34701 100644
--- a/app/assets/javascripts/sidebar/mount_sidebar.js
+++ b/app/assets/javascripts/sidebar/mount_sidebar.js
@@ -17,7 +17,6 @@ import { __ } from '~/locale';
 import { apolloProvider } from '~/graphql_shared/issuable_client';
 import Translate from '~/vue_shared/translate';
 import UserSelect from '~/vue_shared/components/user_select/user_select.vue';
-import NewHeaderActionsPopover from '~/issues/show/components/new_header_actions_popover.vue';
 import CollapsedAssigneeList from './components/assignees/collapsed_assignee_list.vue';
 import SidebarAssignees from './components/assignees/sidebar_assignees.vue';
 import SidebarAssigneesWidget from './components/assignees/sidebar_assignees_widget.vue';
@@ -788,21 +787,6 @@ export function mountAssigneesDropdown() {
   });
 }
 
-function mountNewIssuePopover() {
-  const el = document.querySelector('.js-sidebar-header-popover');
-
-  if (!el) {
-    return null;
-  }
-
-  return new Vue({
-    el,
-    name: 'NewHeaderActionsPopover',
-    render: (createElement) =>
-      createElement(NewHeaderActionsPopover, { props: { issueType: TYPE_MERGE_REQUEST } }),
-  });
-}
-
 const isAssigneesWidgetShown =
   (isInIssuePage() || isInDesignPage() || isInMRPage()) && gon.features.issueAssigneesWidget;
 
@@ -830,7 +814,6 @@ export function mountSidebar(mediator, store) {
   mountSidebarSeverityWidget();
   mountSidebarEscalationStatus();
   mountMoveIssueButton();
-  mountNewIssuePopover();
 }
 
 export { getSidebarOptions };
diff --git a/app/assets/stylesheets/page_bundles/issuable.scss b/app/assets/stylesheets/page_bundles/issuable.scss
index 1b98fd4df07..e0fb95a1359 100644
--- a/app/assets/stylesheets/page_bundles/issuable.scss
+++ b/app/assets/stylesheets/page_bundles/issuable.scss
@@ -165,13 +165,3 @@
     border: 0;
   }
 }
-
-.merge-request-notification-toggle {
-  .gl-toggle {
-    @include gl-ml-auto;
-  }
-
-  .gl-toggle-label {
-    @include gl-font-weight-normal;
-  }
-}
diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss
index 74f61faa9ae..de8142924f9 100644
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -74,7 +74,3 @@
     color: $gl-text-color;
   }
 }
-
-.new-header-popover {
-  z-index: 999;
-}
diff --git a/app/controllers/projects/incidents_controller.rb b/app/controllers/projects/incidents_controller.rb
index 7121096bd77..3842a88d15b 100644
--- a/app/controllers/projects/incidents_controller.rb
+++ b/app/controllers/projects/incidents_controller.rb
@@ -10,7 +10,6 @@ class Projects::IncidentsController < Projects::ApplicationController
     push_force_frontend_feature_flag(:work_items, @project&.work_items_feature_flag_enabled?)
     push_force_frontend_feature_flag(:work_items_mvc, @project&.work_items_mvc_feature_flag_enabled?)
     push_force_frontend_feature_flag(:work_items_mvc_2, @project&.work_items_mvc_2_feature_flag_enabled?)
-    push_frontend_feature_flag(:moved_mr_sidebar, project)
   end
 
   feature_category :incident_management
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index d50f681beec..efe88d17cab 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -67,7 +67,6 @@ class Projects::IssuesController < Projects::ApplicationController
     push_force_frontend_feature_flag(:work_items_mvc, project&.work_items_mvc_feature_flag_enabled?)
     push_force_frontend_feature_flag(:work_items_mvc_2, project&.work_items_mvc_2_feature_flag_enabled?)
     push_frontend_feature_flag(:epic_widget_edit_confirmation, project)
-    push_frontend_feature_flag(:moved_mr_sidebar, project)
   end
 
   around_action :allow_gitaly_ref_name_caching, only: [:discussions]
diff --git a/app/graphql/types/ci/job_trace_type.rb b/app/graphql/types/ci/job_trace_type.rb
new file mode 100644
index 00000000000..a68e26106b8
--- /dev/null
+++ b/app/graphql/types/ci/job_trace_type.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# rubocop: disable Graphql/AuthorizeTypes
+module Types
+  module Ci
+    class JobTraceType < BaseObject
+      graphql_name 'CiJobTrace'
+
+      field :html_summary, GraphQL::Types::String, null: false,
+        alpha: { milestone: '15.11' }, # As we want the option to change from 10 if needed
+        description: "HTML summary containing the last 10 lines of the trace."
+
+      def html_summary
+        object.html(last_lines: 10).html_safe
+      end
+    end
+  end
+end
+# rubocop: enable Graphql/AuthorizeTypes
diff --git a/app/graphql/types/ci/job_type.rb b/app/graphql/types/ci/job_type.rb
index 61f2d0cdb51..1d12c296b2e 100644
--- a/app/graphql/types/ci/job_type.rb
+++ b/app/graphql/types/ci/job_type.rb
@@ -101,6 +101,8 @@ module Types
                         description: 'Short SHA1 ID of the commit.'
       field :stuck, GraphQL::Types::Boolean, null: false, method: :stuck?,
                                              description: 'Indicates the job is stuck.'
+      field :trace, Types::Ci::JobTraceType, null: true,
+                                             description: 'Trace generated by the job.'
       field :triggered, GraphQL::Types::Boolean, null: true,
                                                  description: 'Whether the job was triggered.'
       field :web_path, GraphQL::Types::String, null: true,
@@ -144,6 +146,10 @@ module Types
         end
       end
 
+      def trace
+        object.trace if object.has_trace?
+      end
+
       def previous_stage_jobs_or_needs
         if object.scheduling_type == 'stage'
           Gitlab::Graphql::Lazy.with_value(previous_stage_jobs) do |jobs|
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index fc2c927a2b1..179ce01ae44 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -12,8 +12,8 @@ module IssuablesHelper
     end
   end
 
-  def sidebar_gutter_collapsed_class(is_merge_request_with_flag)
-    return "right-sidebar-expanded" if is_merge_request_with_flag
+  def sidebar_gutter_collapsed_class
+    return "right-sidebar-expanded" if moved_mr_sidebar_enabled?
 
     "right-sidebar-#{sidebar_gutter_collapsed? ? 'collapsed' : 'expanded'}"
   end
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 98c378db7d3..e82f09a0a97 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -153,7 +153,7 @@ module IssuesHelper
     issue.moved_from.project.service_desk_enabled? && !issue.project.service_desk_enabled?
   end
 
-  def issue_header_actions_data(project, issuable, current_user, issuable_sidebar)
+  def issue_header_actions_data(project, issuable, current_user)
     new_issuable_params = { issue: {}, add_related_issue: issuable.iid }
     if issuable.incident?
       new_issuable_params[:issuable_template] = 'incident'
@@ -176,8 +176,7 @@ module IssuesHelper
       report_abuse_path: add_category_abuse_reports_path,
       reported_user_id: issuable.author.id,
       reported_from_url: issue_url(issuable),
-      submit_as_spam_path: mark_as_spam_project_issue_path(project, issuable),
-      issuable_email_address: issuable_sidebar.nil? ? '' : issuable_sidebar[:create_note_email]
+      submit_as_spam_path: mark_as_spam_project_issue_path(project, issuable)
     }
   end
 
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 5cacc8e2199..a36d61378a0 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -179,10 +179,6 @@ module MergeRequestsHelper
     end
   end
 
-  def moved_mr_sidebar_enabled?
-    Feature.enabled?(:moved_mr_sidebar, @project)
-  end
-
   def diffs_tab_pane_data(project, merge_request, params)
     {
       "is-locked": merge_request.discussion_locked?,
@@ -260,6 +256,10 @@ module MergeRequestsHelper
     _('%{author} requested to merge %{source_branch} %{copy_button} into %{target_branch} %{created_at}').html_safe % { author: link_to_author.html_safe, source_branch: merge_request_source_branch(merge_request).html_safe, copy_button: copy_button.html_safe, target_branch: target_branch.html_safe, created_at: time_ago_with_tooltip(merge_request.created_at, html_class: 'gl-display-inline-block').html_safe }
   end
 
+  def moved_mr_sidebar_enabled?
+    Feature.enabled?(:moved_mr_sidebar, @project) && defined?(@merge_request)
+  end
+
   def sticky_header_data
     data = {
       iid: @merge_request.iid,
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index bd8627b9530..59ffe6a183e 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -38,7 +38,7 @@ module NavHelper
   end
 
   def page_gutter_class
-    moved_sidebar_enabled = @is_merge_request_with_flag
+    moved_sidebar_enabled = current_controller?('merge_requests') && moved_mr_sidebar_enabled?
 
     if (page_has_markdown? || current_path?('projects/merge_requests#diffs')) && !current_controller?('conflicts')
       if cookies[:collapsed_gutter] == 'true'
diff --git a/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml b/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml
index 9b6263f2145..92b0a5a0b90 100644
--- a/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml
+++ b/app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml
@@ -1,8 +1,7 @@
 - display_issuable_type = issuable_display_type(@merge_request)
 
 .btn-group.gl-md-ml-3.gl-display-flex.dropdown.gl-dropdown.gl-md-w-auto.gl-w-full
-  %span.js-sidebar-header-popover
-  = button_tag type: 'button', id: "new-actions-header-dropdown", class: "btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle btn-default-tertiary dropdown-icon-only dropdown-toggle-no-caret has-tooltip gl-display-none! gl-md-display-inline-flex! gl-rounded-base!", data: { toggle: 'dropdown', title: _('Merge request actions'), testid: 'merge-request-actions', 'aria-label': _('Merge request actions') } do
+  = button_tag type: 'button', class: "btn dropdown-toggle btn-default btn-md gl-button gl-dropdown-toggle btn-default-tertiary dropdown-icon-only dropdown-toggle-no-caret has-tooltip gl-display-none! gl-md-display-inline-flex!", data: { toggle: 'dropdown', title: _('Merge request actions'), testid: 'merge-request-actions', 'aria-label': _('Merge request actions') } do
     = sprite_icon "ellipsis_v", size: 16, css_class: "dropdown-icon gl-icon"
   = button_tag type: 'button', class: "btn dropdown-toggle btn-default btn-md btn-block gl-button gl-dropdown-toggle gl-md-display-none!", data: { 'toggle' => 'dropdown' } do
     %span.gl-dropdown-button-text= _('Merge request actions')
diff --git a/app/views/projects/merge_requests/creations/_new_submit.html.haml b/app/views/projects/merge_requests/creations/_new_submit.html.haml
index 5b12ce7b28d..b6b4d15564b 100644
--- a/app/views/projects/merge_requests/creations/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/creations/_new_submit.html.haml
@@ -10,12 +10,24 @@
   - if params[:nav_source].present?
     = hidden_field_tag(:nav_source, params[:nav_source])
 
-.mr-compare.merge-request.js-merge-request-new-submit{ 'data-mr-submit-action': "#{j params[:tab].presence || 'new'}" }
+.mr-compare.merge-request.js-merge-request-new-submit.gl-mt-5{ 'data-mr-submit-action': "#{j params[:tab].presence || 'new'}" }
   - if @commits.empty?
-    .commits-empty
-      %h4
-        = _("There are no commits yet.")
-      = custom_icon ('illustration_no_commits')
+    .merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') }
+      .merge-request-tabs-container.gl-display-flex.gl-justify-content-space-between
+        .scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
+          .fade-left= sprite_icon('chevron-lg-left', size: 12)
+          .fade-right= sprite_icon('chevron-lg-right', size: 12)
+          %ul.merge-request-tabs.nav.nav-tabs.nav-links.no-top.no-bottom.gl-display-flex.gl-flex-wrap-nowrap.gl-m-0.gl-p-0.js-tabs-affix
+            %li.commits-tab.new-tab
+              = link_to url_for(safe_params), data: {target: 'div#commits', action: 'new', toggle: 'tabvue'} do
+                = _("Commits")
+                = gl_badge_tag @total_commit_count, { size: :sm }, { class: 'gl-tab-counter-badge' }
+
+    #diff-notes-app.tab-content
+      #new.commits.tab-pane.active
+        .commits-empty.gl-text-left.gl-my-5.gl-text-gray-500
+          %p
+            = _("There are no commits yet.")
   - else
     .merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') }
       .merge-request-tabs-container.gl-display-flex.gl-justify-content-space-between
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 82e95a6a8e8..f54354674e2 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -9,15 +9,14 @@
 - reviewers = local_assigns.fetch(:reviewers, nil)
 - in_group_context_with_iterations = @project.group.present? && issuable_sidebar[:supports_iterations]
 - is_merge_request = issuable_type === 'merge_request'
-- moved_sidebar_enabled = moved_mr_sidebar_enabled?
-- is_merge_request_with_flag = is_merge_request && moved_sidebar_enabled
+- moved_sidebar_enabled = moved_mr_sidebar_enabled? && is_merge_request
 
-%aside.right-sidebar.js-right-sidebar.js-issuable-sidebar{ data: { signed: { in: signed_in }, issuable_type: issuable_type }, class: "#{sidebar_gutter_collapsed_class(is_merge_request_with_flag)} #{'right-sidebar-merge-requests' if is_merge_request_with_flag}", 'aria-live' => 'polite', 'aria-label': issuable_type }
-  .issuable-sidebar{ class: "#{'is-merge-request' if is_merge_request_with_flag}" }
-    .issuable-sidebar-header{ class: "#{'gl-pb-2! gl-md-display-flex gl-justify-content-end gl-lg-display-none!' if is_merge_request_with_flag}" }
+%aside.right-sidebar.js-right-sidebar.js-issuable-sidebar{ data: { signed: { in: signed_in }, issuable_type: issuable_type }, class: "#{sidebar_gutter_collapsed_class} #{'right-sidebar-merge-requests' if moved_sidebar_enabled}", 'aria-live' => 'polite', 'aria-label': issuable_type }
+  .issuable-sidebar{ class: "#{'is-merge-request' if moved_sidebar_enabled}" }
+    .issuable-sidebar-header{ class: "#{'gl-pb-2! gl-md-display-flex gl-justify-content-end gl-lg-display-none!' if moved_sidebar_enabled}" }
       %button.btn.gl-button.gutter-toggle.float-right.js-sidebar-toggle.has-tooltip{ type: "reset", class: "gl-shadow-none! #{'gl-display-block' if moved_sidebar_enabled}", "aria-label" => _('Toggle sidebar'), title: sidebar_gutter_tooltip_text, data: { container: 'body', placement: 'left', boundary: 'viewport' } }
         = sidebar_gutter_toggle_icon
-      - if signed_in && !is_merge_request_with_flag
+      - if signed_in && !moved_sidebar_enabled
         .js-sidebar-todo-widget-root{ data: { project_path: issuable_sidebar[:project_full_path], iid: issuable_sidebar[:iid], id: issuable_sidebar[:id] } }
 
     = form_for issuable_type, url: issuable_sidebar[:issuable_json_path], remote: true, html: { class: 'issuable-context-form inline-update js-issuable-update' } do |f|
@@ -82,17 +81,17 @@
 
       .js-sidebar-participants-widget-root
 
-      - if !moved_sidebar_enabled
-        .block.with-sub-blocks
+      .block.with-sub-blocks
+        - if !moved_sidebar_enabled
           .js-sidebar-reference-widget-root
-          - if is_merge_request && !moved_sidebar_enabled
-            .sub-block.js-sidebar-source-branch
-              .sidebar-collapsed-icon.js-dont-change-state
-                = clipboard_button(text: source_branch, title: _('Copy branch name'), placement: "left", boundary: 'viewport', class: 'btn-clipboard gl-button btn-default-tertiary btn-icon btn-sm js-source-branch-copy')
-              .gl-display-flex.gl-align-items-center.gl-justify-content-space-between.gl-mb-2.hide-collapsed
-                %span.gl-overflow-hidden.gl-text-overflow-ellipsis.gl-white-space-nowrap
-                  = _('Source branch: %{source_branch_open}%{source_branch}%{source_branch_close}').html_safe % { source_branch_open: "<span class='gl-font-monospace' data-testid='ref-name' title='#{html_escape(source_branch)}'>".html_safe, source_branch_close: "</span>".html_safe, source_branch: html_escape(source_branch) }
-                = clipboard_button(text: source_branch, title: _('Copy branch name'), placement: "left", boundary: 'viewport', class: 'btn-clipboard gl-button btn-default-tertiary btn-icon btn-sm js-source-branch-copy')
+        - if issuable_type == 'merge_request' && !moved_sidebar_enabled
+          .sub-block.js-sidebar-source-branch
+            .sidebar-collapsed-icon.js-dont-change-state
+              = clipboard_button(text: source_branch, title: _('Copy branch name'), placement: "left", boundary: 'viewport', class: 'btn-clipboard gl-button btn-default-tertiary btn-icon btn-sm js-source-branch-copy')
+            .gl-display-flex.gl-align-items-center.gl-justify-content-space-between.gl-mb-2.hide-collapsed
+              %span.gl-overflow-hidden.gl-text-overflow-ellipsis.gl-white-space-nowrap
+                = _('Source branch: %{source_branch_open}%{source_branch}%{source_branch_close}').html_safe % { source_branch_open: "<span class='gl-font-monospace' data-testid='ref-name' title='#{html_escape(source_branch)}'>".html_safe, source_branch_close: "</span>".html_safe, source_branch: html_escape(source_branch) }
+              = clipboard_button(text: source_branch, title: _('Copy branch name'), placement: "left", boundary: 'viewport', class: 'btn-clipboard gl-button btn-default-tertiary btn-icon btn-sm js-source-branch-copy')
 
       - if show_forwarding_email
         .block
diff --git a/app/views/shared/issue_type/_details_header.html.haml b/app/views/shared/issue_type/_details_header.html.haml
index 0326f35a12b..ccb501dae11 100644
--- a/app/views/shared/issue_type/_details_header.html.haml
+++ b/app/views/shared/issue_type/_details_header.html.haml
@@ -19,4 +19,4 @@
     %a.btn.gl-button.btn-default.btn-icon.float-right.gl-display-block.d-sm-none.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" }
       = sprite_icon('chevron-double-lg-left')
 
-  .js-issue-header-actions{ data: issue_header_actions_data(@project, issuable, current_user, @issuable_sidebar) }
+  .js-issue-header-actions{ data: issue_header_actions_data(@project, issuable, current_user) }
diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml
index 5477b9395ea..cc1965945ac 100644
--- a/app/views/shared/milestones/_sidebar.html.haml
+++ b/app/views/shared/milestones/_sidebar.html.haml
@@ -1,7 +1,7 @@
 - affix_offset = local_assigns.fetch(:affix_offset, "50")
 - project = local_assigns[:project]
 
-%aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => affix_offset, "spy" => "affix", "always-show-toggle" => true }, class: sidebar_gutter_collapsed_class(false), 'aria-live' => 'polite', 'aria-label': _('Milestone') }
+%aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => affix_offset, "spy" => "affix", "always-show-toggle" => true }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite', 'aria-label': _('Milestone') }
   .issuable-sidebar.milestone-sidebar
     .block.milestone-progress.issuable-sidebar-header
       %a.gutter-toggle.float-right.js-sidebar-toggle.has-tooltip{ role: "button", href: "#", "aria-label" => s_('MilestoneSidebar|Toggle sidebar'), title: sidebar_gutter_tooltip_text, data: { container: 'body', placement: 'left', boundary: 'viewport' } }
diff --git a/app/views/shared/notes/_edit_form.html.haml b/app/views/shared/notes/_edit_form.html.haml
index cbf0b6f1051..72081856da6 100644
--- a/app/views/shared/notes/_edit_form.html.haml
+++ b/app/views/shared/notes/_edit_form.html.haml
@@ -9,6 +9,7 @@
     .note-form-actions.clearfix
       .settings-message.note-edit-warning.js-finish-edit-warning
         = _("Finish editing this message first!")
-      = submit_tag _('Save comment'), class: 'gl-button btn btn-confirm js-comment-save-button', data: { qa_selector: 'save_comment_button' }
+      = render Pajamas::ButtonComponent.new(type: 'submit', variant: :confirm, button_options: { class: 'js-comment-save-button', data: { qa_selector: 'save_comment_button' } }) do
+        = _("Save comment")
       = render Pajamas::ButtonComponent.new(button_options: { class: 'note-edit-cancel' }) do
         = _("Cancel")