Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 13 deletions

diff --git a/app/assets/javascripts/sidebar/components/severity/constants.js b/app/assets/javascripts/sidebar/components/severity/constants.js
index c7d6a51ea1c..4f58ff38121 100644
--- a/app/assets/javascripts/sidebar/components/severity/constants.js
+++ b/app/assets/javascripts/sidebar/components/severity/constants.js
@@ -32,8 +32,6 @@ export const ISSUABLE_TYPES = {
   INCIDENT: 'incident',
 };
 
-export const SIDEBAR_ANIMATION_DURATION = 300;
-
 export const I18N = {
   UPDATE_SEVERITY_ERROR: s__('SeverityWidget|There was an error while updating severity.'),
   TRY_AGAIN: __('Please try again'),
diff --git a/app/assets/javascripts/sidebar/components/severity/sidebar_severity.vue b/app/assets/javascripts/sidebar/components/severity/sidebar_severity.vue
index 65ff7a6d2ac..8f3610b912a 100644
--- a/app/assets/javascripts/sidebar/components/severity/sidebar_severity.vue
+++ b/app/assets/javascripts/sidebar/components/severity/sidebar_severity.vue
@@ -7,7 +7,7 @@ import {
   GlSprintf,
   GlLink,
 } from '@gitlab/ui';
-import { INCIDENT_SEVERITY, ISSUABLE_TYPES, SIDEBAR_ANIMATION_DURATION, I18N } from './constants';
+import { INCIDENT_SEVERITY, ISSUABLE_TYPES, I18N } from './constants';
 import updateIssuableSeverity from './graphql/mutations/update_issuable_severity.mutation.graphql';
 import SeverityToken from './severity.vue';
 import createFlash from '~/flash';
@@ -91,15 +91,8 @@ export default {
       const event = new Event('hidden.gl.dropdown');
       this.$el.dispatchEvent(event);
     },
-    toggleFormDropdown(collapsedSidebar) {
+    toggleFormDropdown() {
       this.isDropdownShowing = !this.isDropdownShowing;
-      const timeout = collapsedSidebar ? SIDEBAR_ANIMATION_DURATION : 0;
-      setTimeout(() => {
-        const { dropdown } = this.$refs;
-        if (dropdown && this.isDropdownShowing) {
-          dropdown.show();
-        }
-      }, timeout);
     },
     updateSeverity(value) {
       this.hideDropdown();
@@ -143,7 +136,7 @@ export default {
 
 <template>
   <div ref="sidebarSeverity" class="block">
-    <div ref="severity" class="sidebar-collapsed-icon" @click="toggleFormDropdown(true)">
+    <div ref="severity" class="sidebar-collapsed-icon" @click="toggleFormDropdown">
       <severity-token :severity="selectedItem" :icon-size="14" :icon-only="true" />
       <gl-tooltip :target="() => $refs.severity" boundary="viewport" placement="left">
         <gl-sprintf :message="$options.i18n.SEVERITY_VALUE">
@@ -168,7 +161,6 @@ export default {
       </p>
 
       <gl-dropdown
-        ref="dropdown"
         :class="dropdownClass"
         block
         :text="selectedItem.label"