Add latest changes from gitlab-org/gitlab@master

6 files changed, 18 insertions, 18 deletions

diff --git a/app/assets/javascripts/monitoring/components/alert_widget_form.vue b/app/assets/javascripts/monitoring/components/alert_widget_form.vue
index f5d29d63dfd..506a98f16f7 100644
--- a/app/assets/javascripts/monitoring/components/alert_widget_form.vue
+++ b/app/assets/javascripts/monitoring/components/alert_widget_form.vue
@@ -7,7 +7,7 @@ import {
   GlButtonGroup,
   GlFormGroup,
   GlFormInput,
-  GlNewDropdown as GlDropdown,
+  GlDropdown,
   GlNewDropdownItem as GlDropdownItem,
   GlModal,
   GlTooltipDirective,
diff --git a/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue b/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue
index 68afa2ace01..b7834758a2e 100644
--- a/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue
@@ -2,7 +2,7 @@
 import { mapState, mapGetters, mapActions } from 'vuex';
 import {
   GlDeprecatedButton,
-  GlNewDropdown,
+  GlDropdown,
   GlNewDropdownDivider,
   GlNewDropdownItem,
   GlModal,
@@ -23,7 +23,7 @@ import { getAddMetricTrackingOptions } from '../utils';
 export default {
   components: {
     GlDeprecatedButton,
-    GlNewDropdown,
+    GlDropdown,
     GlNewDropdownDivider,
     GlNewDropdownItem,
     GlModal,
@@ -143,7 +143,7 @@ export default {
     as part of https://gitlab.com/gitlab-org/gitlab-ui/-/issues/936
     The variant will create a dropdown with an icon, no text and no caret    
   -->
-  <gl-new-dropdown
+  <gl-dropdown
     v-gl-tooltip
     data-testid="actions-menu"
     data-qa-selector="actions_menu_dropdown"
@@ -287,5 +287,5 @@ export default {
         :project-path="projectPath"
       />
     </template>
-  </gl-new-dropdown>
+  </gl-dropdown>
 </template>
diff --git a/app/assets/javascripts/monitoring/components/dashboard_header.vue b/app/assets/javascripts/monitoring/components/dashboard_header.vue
index 67c56766d99..2c4aecba719 100644
--- a/app/assets/javascripts/monitoring/components/dashboard_header.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard_header.vue
@@ -3,7 +3,7 @@ import { debounce } from 'lodash';
 import { mapActions, mapState, mapGetters } from 'vuex';
 import {
   GlButton,
-  GlNewDropdown,
+  GlDropdown,
   GlLoadingIcon,
   GlNewDropdownItem,
   GlNewDropdownHeader,
@@ -28,7 +28,7 @@ export default {
   components: {
     GlIcon,
     GlButton,
-    GlNewDropdown,
+    GlDropdown,
     GlLoadingIcon,
     GlNewDropdownItem,
     GlNewDropdownHeader,
@@ -181,7 +181,7 @@ export default {
     <span aria-hidden="true" class="gl-pl-3 border-left gl-mb-3 d-none d-sm-block"></span>
 
     <div class="mb-2 pr-2 d-flex d-sm-block">
-      <gl-new-dropdown
+      <gl-dropdown
         id="monitor-environments-dropdown"
         ref="monitorEnvironmentsDropdown"
         class="flex-grow-1"
@@ -214,7 +214,7 @@ export default {
             {{ __('No matching results') }}
           </div>
         </div>
-      </gl-new-dropdown>
+      </gl-dropdown>
     </div>
 
     <div class="mb-2 pr-2 d-flex d-sm-block">
diff --git a/app/assets/javascripts/monitoring/components/dashboard_panel.vue b/app/assets/javascripts/monitoring/components/dashboard_panel.vue
index 278858d3a94..e8968241af9 100644
--- a/app/assets/javascripts/monitoring/components/dashboard_panel.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard_panel.vue
@@ -6,7 +6,7 @@ import {
   GlIcon,
   GlLink,
   GlLoadingIcon,
-  GlNewDropdown as GlDropdown,
+  GlDropdown,
   GlNewDropdownItem as GlDropdownItem,
   GlNewDropdownDivider as GlDropdownDivider,
   GlModal,
diff --git a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
index a4d388fb064..c9f6e4bd2f5 100644
--- a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
+++ b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
@@ -2,7 +2,7 @@
 import { mapState, mapGetters } from 'vuex';
 import {
   GlIcon,
-  GlNewDropdown,
+  GlDropdown,
   GlNewDropdownItem,
   GlNewDropdownHeader,
   GlNewDropdownDivider,
@@ -17,7 +17,7 @@ const events = {
 export default {
   components: {
     GlIcon,
-    GlNewDropdown,
+    GlDropdown,
     GlNewDropdownItem,
     GlNewDropdownHeader,
     GlNewDropdownDivider,
@@ -73,7 +73,7 @@ export default {
 };
 </script>
 <template>
-  <gl-new-dropdown
+  <gl-dropdown
     toggle-class="dropdown-menu-toggle"
     menu-class="monitor-dashboard-dropdown-menu"
     :text="selectedDashboardText"
@@ -127,5 +127,5 @@ export default {
         {{ __('No matching results') }}
       </div>
     </div>
-  </gl-new-dropdown>
+  </gl-dropdown>
 </template>
diff --git a/app/assets/javascripts/monitoring/components/refresh_button.vue b/app/assets/javascripts/monitoring/components/refresh_button.vue
index 0e9605450ed..3414c28d7a6 100644
--- a/app/assets/javascripts/monitoring/components/refresh_button.vue
+++ b/app/assets/javascripts/monitoring/components/refresh_button.vue
@@ -4,7 +4,7 @@ import { mapActions } from 'vuex';
 import {
   GlButtonGroup,
   GlButton,
-  GlNewDropdown,
+  GlDropdown,
   GlNewDropdownItem,
   GlNewDropdownDivider,
   GlTooltipDirective,
@@ -48,7 +48,7 @@ export default {
   components: {
     GlButtonGroup,
     GlButton,
-    GlNewDropdown,
+    GlDropdown,
     GlNewDropdownItem,
     GlNewDropdownDivider,
   },
@@ -152,7 +152,7 @@ export default {
       icon="retry"
       @click="refresh"
     />
-    <gl-new-dropdown
+    <gl-dropdown
       v-if="!disableMetricDashboardRefreshRate"
       v-gl-tooltip
       :title="s__('Metrics|Set refresh rate')"
@@ -173,6 +173,6 @@ export default {
         @click="setRefreshInterval(option)"
         >{{ option.label }}</gl-new-dropdown-item
       >
-    </gl-new-dropdown>
+    </gl-dropdown>
   </gl-button-group>
 </template>