Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 15 deletions

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 7662d645dd9..e5bee4df9b8 100644
--- a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue
+++ b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue
@@ -181,18 +181,18 @@ export default {
 </script>
 
 <template>
-  <li v-if="isMergeRequest" class="gl-new-dropdown-item">
-    <button type="button" class="dropdown-item" @click="toggleSubscribed">
-      <span class="gl-new-dropdown-item-text-wrapper">
-        <template v-if="subscribed">
-          {{ __('Turn off notifications') }}
-        </template>
-        <template v-else>
-          {{ __('Turn on notifications') }}
-        </template>
-      </span>
-    </button>
-  </li>
+  <div v-if="isMergeRequest" class="gl-new-dropdown-item">
+    <div class="gl-px-5 gl-pb-2 gl-pt-1">
+      <gl-toggle
+        :value="subscribed"
+        :label="__('Notifications')"
+        class="merge-request-notification-toggle"
+        label-position="left"
+        data-testid="notifications-toggle"
+        @change="toggleSubscribed"
+      />
+    </div>
+  </div>
   <sidebar-editable-item
     v-else
     ref="editable"
diff --git a/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue b/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue
index 482b9343e70..42e16aae312 100644
--- a/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue
+++ b/app/assets/javascripts/sidebar/components/todo_toggle/sidebar_todo_widget.vue
@@ -6,6 +6,7 @@ import { __, sprintf } from '~/locale';
 import { todoQueries, TodoMutationTypes, todoMutations } from '~/sidebar/constants';
 import { todoLabel } from '~/vue_shared/components/sidebar/todo_toggle//utils';
 import TodoButton from '~/vue_shared/components/sidebar/todo_toggle/todo_button.vue';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import Tracking from '~/tracking';
 
 const trackingMixin = Tracking.mixin();
@@ -19,7 +20,7 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  mixins: [trackingMixin],
+  mixins: [glFeatureFlagsMixin(), trackingMixin],
   inject: {
     isClassicSidebar: {
       default: false,
@@ -81,6 +82,9 @@ export default {
     },
   },
   computed: {
+    isMergeRequest() {
+      return this.glFeatures.movedMrSidebar && this.issuableType === 'merge_request';
+    },
     todoIdQuery() {
       return todoQueries[this.issuableType].query;
     },
@@ -183,12 +187,12 @@ export default {
       :issuable-id="issuableId"
       :is-todo="hasTodo"
       :loading="isLoading"
-      size="small"
+      :size="isMergeRequest ? 'medium' : 'small'"
       class="hide-collapsed"
       @click.stop.prevent="toggleTodo"
     />
     <gl-button
-      v-if="isClassicSidebar"
+      v-if="isClassicSidebar && !isMergeRequest"
       v-gl-tooltip.left.viewport
       :title="tootltipTitle"
       category="tertiary"