Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

2 files changed, 6 insertions, 0 deletions

diff --git a/app/assets/javascripts/notifications/components/notifications_dropdown.vue b/app/assets/javascripts/notifications/components/notifications_dropdown.vue
index 69eb2115bf4..6b450c2b5fd 100644
--- a/app/assets/javascripts/notifications/components/notifications_dropdown.vue
+++ b/app/assets/javascripts/notifications/components/notifications_dropdown.vue
@@ -42,6 +42,9 @@ export default {
     showLabel: {
       default: false,
     },
+    noFlip: {
+      default: false,
+    },
   },
   data() {
     return {
@@ -127,6 +130,7 @@ export default {
       :disabled="disabled"
       :split="isCustomNotification"
       :text="buttonText"
+      :no-flip="noFlip"
       @click="openNotificationsModal"
     >
       <notifications-dropdown-item
diff --git a/app/assets/javascripts/notifications/index.js b/app/assets/javascripts/notifications/index.js
index d60a368703c..a81f2c2590b 100644
--- a/app/assets/javascripts/notifications/index.js
+++ b/app/assets/javascripts/notifications/index.js
@@ -21,6 +21,7 @@ export default () => {
       projectId,
       groupId,
       showLabel,
+      noFlip,
     } = el.dataset;
 
     return new Vue({
@@ -35,6 +36,7 @@ export default () => {
         projectId,
         groupId,
         showLabel: parseBoolean(showLabel),
+        noFlip: parseBoolean(noFlip),
       },
       render(h) {
         return h(NotificationsDropdown);