Add latest changes from gitlab-org/gitlab@master

6 files changed, 46 insertions, 46 deletions

diff --git a/app/assets/javascripts/monitoring/components/alert_widget_form.vue b/app/assets/javascripts/monitoring/components/alert_widget_form.vue
index 506a98f16f7..132df9c9516 100644
--- a/app/assets/javascripts/monitoring/components/alert_widget_form.vue
+++ b/app/assets/javascripts/monitoring/components/alert_widget_form.vue
@@ -8,7 +8,7 @@ import {
   GlFormGroup,
   GlFormInput,
   GlDropdown,
-  GlNewDropdownItem as GlDropdownItem,
+  GlDropdownItem,
   GlModal,
   GlTooltipDirective,
   GlIcon,
diff --git a/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue b/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue
index b7834758a2e..070277fe2dc 100644
--- a/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue
@@ -3,8 +3,8 @@ import { mapState, mapGetters, mapActions } from 'vuex';
 import {
   GlDeprecatedButton,
   GlDropdown,
-  GlNewDropdownDivider,
-  GlNewDropdownItem,
+  GlDropdownDivider,
+  GlDropdownItem,
   GlModal,
   GlIcon,
   GlModalDirective,
@@ -24,8 +24,8 @@ export default {
   components: {
     GlDeprecatedButton,
     GlDropdown,
-    GlNewDropdownDivider,
-    GlNewDropdownItem,
+    GlDropdownDivider,
+    GlDropdownItem,
     GlModal,
     GlIcon,
     DuplicateDashboardModal,
@@ -157,13 +157,13 @@ export default {
     </template>
 
     <template v-if="addingMetricsAvailable">
-      <gl-new-dropdown-item
+      <gl-dropdown-item
         v-gl-modal="$options.modalIds.addMetric"
         data-qa-selector="add_metric_button"
         data-testid="add-metric-item"
       >
         {{ $options.i18n.addMetric }}
-      </gl-new-dropdown-item>
+      </gl-dropdown-item>
       <gl-modal
         ref="addMetricModal"
         :modal-id="$options.modalIds.addMetric"
@@ -194,20 +194,20 @@ export default {
       </gl-modal>
     </template>
 
-    <gl-new-dropdown-item
+    <gl-dropdown-item
       v-if="isMenuItemEnabled.addPanel"
       data-testid="add-panel-item-enabled"
       :to="newPanelPageLocation"
     >
       {{ $options.i18n.addPanel }}
-    </gl-new-dropdown-item>
+    </gl-dropdown-item>
 
     <!--
       wrapper for tooltip as button can be `disabled`
       https://bootstrap-vue.org/docs/components/tooltip#disabled-elements
     -->
     <div v-else v-gl-tooltip :title="$options.i18n.addPanelInfo">
-      <gl-new-dropdown-item
+      <gl-dropdown-item
         :alt="$options.i18n.addPanelInfo"
         :to="newPanelPageLocation"
         data-testid="add-panel-item-disabled"
@@ -215,24 +215,24 @@ export default {
         class="gl-cursor-not-allowed"
       >
         <span class="gl-text-gray-400">{{ $options.i18n.addPanel }}</span>
-      </gl-new-dropdown-item>
+      </gl-dropdown-item>
     </div>
 
-    <gl-new-dropdown-item
+    <gl-dropdown-item
       v-if="isMenuItemEnabled.editDashboard"
       :href="selectedDashboard ? selectedDashboard.project_blob_path : null"
       data-qa-selector="edit_dashboard_button_enabled"
       data-testid="edit-dashboard-item-enabled"
     >
       {{ $options.i18n.editDashboard }}
-    </gl-new-dropdown-item>
+    </gl-dropdown-item>
 
     <!--
       wrapper for tooltip as button can be `disabled`
       https://bootstrap-vue.org/docs/components/tooltip#disabled-elements
     -->
     <div v-else v-gl-tooltip :title="$options.i18n.editDashboardInfo">
-      <gl-new-dropdown-item
+      <gl-dropdown-item
         :alt="$options.i18n.editDashboardInfo"
         :href="selectedDashboard ? selectedDashboard.project_blob_path : null"
         data-testid="edit-dashboard-item-disabled"
@@ -240,16 +240,16 @@ export default {
         class="gl-cursor-not-allowed"
       >
         <span class="gl-text-gray-400">{{ $options.i18n.editDashboard }}</span>
-      </gl-new-dropdown-item>
+      </gl-dropdown-item>
     </div>
 
     <template v-if="isMenuItemShown.duplicateDashboard">
-      <gl-new-dropdown-item
+      <gl-dropdown-item
         v-gl-modal="$options.modalIds.duplicateDashboard"
         data-testid="duplicate-dashboard-item"
       >
         {{ $options.i18n.duplicateDashboard }}
-      </gl-new-dropdown-item>
+      </gl-dropdown-item>
 
       <duplicate-dashboard-modal
         :default-branch="defaultBranch"
@@ -259,25 +259,25 @@ export default {
       />
     </template>
 
-    <gl-new-dropdown-item
+    <gl-dropdown-item
       v-if="selectedDashboard"
       data-testid="star-dashboard-item"
       :disabled="isUpdatingStarredValue"
       @click="toggleStarredValue()"
     >
       {{ selectedDashboard.starred ? $options.i18n.unstarDashboard : $options.i18n.starDashboard }}
-    </gl-new-dropdown-item>
+    </gl-dropdown-item>
 
-    <gl-new-dropdown-divider />
+    <gl-dropdown-divider />
 
-    <gl-new-dropdown-item
+    <gl-dropdown-item
       v-gl-modal="$options.modalIds.createDashboard"
       data-testid="create-dashboard-item"
       :disabled="!isMenuItemEnabled.createDashboard"
       :class="{ 'monitoring-actions-item-disabled': !isMenuItemEnabled.createDashboard }"
     >
       {{ $options.i18n.createDashboard }}
-    </gl-new-dropdown-item>
+    </gl-dropdown-item>
 
     <template v-if="isMenuItemEnabled.createDashboard">
       <create-dashboard-modal
diff --git a/app/assets/javascripts/monitoring/components/dashboard_header.vue b/app/assets/javascripts/monitoring/components/dashboard_header.vue
index 2c4aecba719..cd9232eaae8 100644
--- a/app/assets/javascripts/monitoring/components/dashboard_header.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard_header.vue
@@ -5,7 +5,7 @@ import {
   GlButton,
   GlDropdown,
   GlLoadingIcon,
-  GlNewDropdownItem,
+  GlDropdownItem,
   GlNewDropdownHeader,
   GlSearchBoxByType,
   GlModalDirective,
@@ -30,7 +30,7 @@ export default {
     GlButton,
     GlDropdown,
     GlLoadingIcon,
-    GlNewDropdownItem,
+    GlDropdownItem,
     GlNewDropdownHeader,
 
     GlSearchBoxByType,
@@ -196,7 +196,7 @@ export default {
 
           <gl-loading-icon v-if="environmentsLoading" :inline="true" />
           <div v-else class="flex-fill overflow-auto">
-            <gl-new-dropdown-item
+            <gl-dropdown-item
               v-for="environment in filteredEnvironments"
               :key="environment.id"
               :is-check-item="true"
@@ -204,7 +204,7 @@ export default {
               :href="getEnvironmentPath(environment.id)"
             >
               {{ environment.name }}
-            </gl-new-dropdown-item>
+            </gl-dropdown-item>
           </div>
           <div
             v-show="shouldShowEnvironmentsDropdownNoMatchedMsg"
diff --git a/app/assets/javascripts/monitoring/components/dashboard_panel.vue b/app/assets/javascripts/monitoring/components/dashboard_panel.vue
index e8968241af9..18310f7c71e 100644
--- a/app/assets/javascripts/monitoring/components/dashboard_panel.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard_panel.vue
@@ -7,8 +7,8 @@ import {
   GlLink,
   GlLoadingIcon,
   GlDropdown,
-  GlNewDropdownItem as GlDropdownItem,
-  GlNewDropdownDivider as GlDropdownDivider,
+  GlDropdownItem,
+  GlDropdownDivider,
   GlModal,
   GlModalDirective,
   GlSprintf,
diff --git a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
index c9f6e4bd2f5..a84977d9da9 100644
--- a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
+++ b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
@@ -3,9 +3,9 @@ import { mapState, mapGetters } from 'vuex';
 import {
   GlIcon,
   GlDropdown,
-  GlNewDropdownItem,
+  GlDropdownItem,
   GlNewDropdownHeader,
-  GlNewDropdownDivider,
+  GlDropdownDivider,
   GlSearchBoxByType,
   GlModalDirective,
 } from '@gitlab/ui';
@@ -18,9 +18,9 @@ export default {
   components: {
     GlIcon,
     GlDropdown,
-    GlNewDropdownItem,
+    GlDropdownItem,
     GlNewDropdownHeader,
-    GlNewDropdownDivider,
+    GlDropdownDivider,
     GlSearchBoxByType,
   },
   directives: {
@@ -87,7 +87,7 @@ export default {
       />
 
       <div class="flex-fill overflow-auto">
-        <gl-new-dropdown-item
+        <gl-dropdown-item
           v-for="dashboard in starredDashboards"
           :key="dashboard.path"
           :is-check-item="true"
@@ -100,13 +100,13 @@ export default {
             </span>
             <gl-icon class="text-muted gl-flex-shrink-0 gl-ml-3 gl-align-self-center" name="star" />
           </div>
-        </gl-new-dropdown-item>
-        <gl-new-dropdown-divider
+        </gl-dropdown-item>
+        <gl-dropdown-divider
           v-if="starredDashboards.length && nonStarredDashboards.length"
           ref="starredListDivider"
         />
 
-        <gl-new-dropdown-item
+        <gl-dropdown-item
           v-for="dashboard in nonStarredDashboards"
           :key="dashboard.path"
           :is-check-item="true"
@@ -116,7 +116,7 @@ export default {
           <span class="gl-overflow-hidden gl-overflow-wrap-break">
             {{ dashboardDisplayName(dashboard) }}
           </span>
-        </gl-new-dropdown-item>
+        </gl-dropdown-item>
       </div>
 
       <div
diff --git a/app/assets/javascripts/monitoring/components/refresh_button.vue b/app/assets/javascripts/monitoring/components/refresh_button.vue
index 3414c28d7a6..e0d9f92440b 100644
--- a/app/assets/javascripts/monitoring/components/refresh_button.vue
+++ b/app/assets/javascripts/monitoring/components/refresh_button.vue
@@ -5,8 +5,8 @@ import {
   GlButtonGroup,
   GlButton,
   GlDropdown,
-  GlNewDropdownItem,
-  GlNewDropdownDivider,
+  GlDropdownItem,
+  GlDropdownDivider,
   GlTooltipDirective,
 } from '@gitlab/ui';
 import { n__, __ } from '~/locale';
@@ -49,8 +49,8 @@ export default {
     GlButtonGroup,
     GlButton,
     GlDropdown,
-    GlNewDropdownItem,
-    GlNewDropdownDivider,
+    GlDropdownItem,
+    GlDropdownDivider,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -158,20 +158,20 @@ export default {
       :title="s__('Metrics|Set refresh rate')"
       :text="dropdownText"
     >
-      <gl-new-dropdown-item
+      <gl-dropdown-item
         :is-check-item="true"
         :is-checked="refreshInterval === null"
         @click="removeRefreshInterval()"
-        >{{ __('Off') }}</gl-new-dropdown-item
+        >{{ __('Off') }}</gl-dropdown-item
       >
-      <gl-new-dropdown-divider />
-      <gl-new-dropdown-item
+      <gl-dropdown-divider />
+      <gl-dropdown-item
         v-for="(option, i) in $options.refreshIntervals"
         :key="i"
         :is-check-item="true"
         :is-checked="isChecked(option)"
         @click="setRefreshInterval(option)"
-        >{{ option.label }}</gl-new-dropdown-item
+        >{{ option.label }}</gl-dropdown-item
       >
     </gl-dropdown>
   </gl-button-group>