diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/assets/javascripts/logs/components/environment_logs.vue | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/javascripts/logs/components/environment_logs.vue')
-rw-r--r-- | app/assets/javascripts/logs/components/environment_logs.vue | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/app/assets/javascripts/logs/components/environment_logs.vue b/app/assets/javascripts/logs/components/environment_logs.vue index f37f48aa431..97b96cb5839 100644 --- a/app/assets/javascripts/logs/components/environment_logs.vue +++ b/app/assets/javascripts/logs/components/environment_logs.vue @@ -5,10 +5,10 @@ import { GlSprintf, GlIcon, GlAlert, - GlDropdown, - GlDropdownHeader, - GlDropdownItem, - GlDropdownDivider, + GlDeprecatedDropdown, + GlDeprecatedDropdownHeader, + GlDeprecatedDropdownItem, + GlDeprecatedDropdownDivider, GlInfiniteScroll, } from '@gitlab/ui'; @@ -25,10 +25,10 @@ export default { GlSprintf, GlIcon, GlAlert, - GlDropdown, - GlDropdownHeader, - GlDropdownItem, - GlDropdownDivider, + GlDeprecatedDropdown, + GlDeprecatedDropdownHeader, + GlDeprecatedDropdownItem, + GlDeprecatedDropdownDivider, GlInfiniteScroll, LogSimpleFilters, LogAdvancedFilters, @@ -174,16 +174,16 @@ export default { <div class="top-bar d-md-flex border bg-secondary-50 pt-2 pr-1 pb-0 pl-2"> <div class="flex-grow-0"> - <gl-dropdown + <gl-deprecated-dropdown id="environments-dropdown" :text="environments.current || managedApps.current" :disabled="environments.isLoading" class="mb-2 gl-h-32 pr-2 d-flex d-md-block js-environments-dropdown" > - <gl-dropdown-header class="gl-text-center"> + <gl-deprecated-dropdown-header class="gl-text-center"> {{ s__('Environments|Environments') }} - </gl-dropdown-header> - <gl-dropdown-item + </gl-deprecated-dropdown-header> + <gl-deprecated-dropdown-item v-for="env in environments.options" :key="env.id" @click="showEnvironment(env.name)" @@ -195,12 +195,12 @@ export default { /> <div class="gl-flex-grow-1">{{ env.name }}</div> </div> - </gl-dropdown-item> - <gl-dropdown-divider /> - <gl-dropdown-header class="gl-text-center"> + </gl-deprecated-dropdown-item> + <gl-deprecated-dropdown-divider /> + <gl-deprecated-dropdown-header class="gl-text-center"> {{ s__('Environments|Managed apps') }} - </gl-dropdown-header> - <gl-dropdown-item + </gl-deprecated-dropdown-header> + <gl-deprecated-dropdown-item v-for="app in managedApps.options" :key="app.id" @click="showManagedApp(app.name)" @@ -212,8 +212,8 @@ export default { /> <div class="gl-flex-grow-1">{{ app.name }}</div> </div> - </gl-dropdown-item> - </gl-dropdown> + </gl-deprecated-dropdown-item> + </gl-deprecated-dropdown> </div> <log-advanced-filters |