Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-15 03:09:47 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-15 03:09:47 +0300
commit09bd62c59d070ab2bbcb4079a44dcb78c76666b5 (patch)
tree6ae40e0c522f977d6f3abb97cba997ec87d7cdb4 /app/assets/javascripts/monitoring
parent9689350c651e2428924ea1096905278536f1dc7a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring')
-rw-r--r--app/assets/javascripts/monitoring/components/dashboard_header.vue6
-rw-r--r--app/assets/javascripts/monitoring/components/dashboards_dropdown.vue6
2 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard_header.vue b/app/assets/javascripts/monitoring/components/dashboard_header.vue
index cd9232eaae8..e468728a954 100644
--- a/app/assets/javascripts/monitoring/components/dashboard_header.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard_header.vue
@@ -6,7 +6,7 @@ import {
GlDropdown,
GlLoadingIcon,
GlDropdownItem,
- GlNewDropdownHeader,
+ GlDropdownSectionHeader,
GlSearchBoxByType,
GlModalDirective,
GlTooltipDirective,
@@ -31,7 +31,7 @@ export default {
GlDropdown,
GlLoadingIcon,
GlDropdownItem,
- GlNewDropdownHeader,
+ GlDropdownSectionHeader,
GlSearchBoxByType,
@@ -191,7 +191,7 @@ export default {
:text="environmentDropdownText"
>
<div class="d-flex flex-column overflow-hidden">
- <gl-new-dropdown-header>{{ __('Environment') }}</gl-new-dropdown-header>
+ <gl-dropdown-section-header>{{ __('Environment') }}</gl-dropdown-section-header>
<gl-search-box-by-type class="gl-m-3" @input="debouncedEnvironmentsSearch" />
<gl-loading-icon v-if="environmentsLoading" :inline="true" />
diff --git a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
index a84977d9da9..932efeaaf0e 100644
--- a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
+++ b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
@@ -4,7 +4,7 @@ import {
GlIcon,
GlDropdown,
GlDropdownItem,
- GlNewDropdownHeader,
+ GlDropdownSectionHeader,
GlDropdownDivider,
GlSearchBoxByType,
GlModalDirective,
@@ -19,7 +19,7 @@ export default {
GlIcon,
GlDropdown,
GlDropdownItem,
- GlNewDropdownHeader,
+ GlDropdownSectionHeader,
GlDropdownDivider,
GlSearchBoxByType,
},
@@ -79,7 +79,7 @@ export default {
:text="selectedDashboardText"
>
<div class="d-flex flex-column overflow-hidden">
- <gl-new-dropdown-header>{{ __('Dashboard') }}</gl-new-dropdown-header>
+ <gl-dropdown-section-header>{{ __('Dashboard') }}</gl-dropdown-section-header>
<gl-search-box-by-type
ref="monitorDashboardsDropdownSearch"
v-model="searchTerm"