Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 11 insertions, 0 deletions

diff --git a/app/assets/javascripts/sidebar/components/incidents/escalation_status.vue b/app/assets/javascripts/sidebar/components/incidents/escalation_status.vue
index 2c32cf89387..aeaac76cff4 100644
--- a/app/assets/javascripts/sidebar/components/incidents/escalation_status.vue
+++ b/app/assets/javascripts/sidebar/components/incidents/escalation_status.vue
@@ -21,6 +21,11 @@ export default {
         return [...STATUS_LIST, null].includes(value);
       },
     },
+    preventDropdownClose: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   computed: {
     currentStatusLabel() {
@@ -35,6 +40,11 @@ export default {
       this.$refs.dropdown.hide();
     },
     getStatusLabel,
+    hideDropdown(event) {
+      if (this.preventDropdownClose) {
+        event.preventDefault();
+      }
+    },
   },
 };
 </script>
@@ -45,6 +55,7 @@ export default {
     block
     :text="currentStatusLabel"
     toggle-class="dropdown-menu-toggle gl-mb-2"
+    @hide="hideDropdown"
   >
     <slot name="header"> </slot>
     <gl-dropdown-item