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/ci_variable_list/components/ci_environments_dropdown.vue | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/javascripts/ci_variable_list/components/ci_environments_dropdown.vue')
-rw-r--r-- | app/assets/javascripts/ci_variable_list/components/ci_environments_dropdown.vue | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/app/assets/javascripts/ci_variable_list/components/ci_environments_dropdown.vue b/app/assets/javascripts/ci_variable_list/components/ci_environments_dropdown.vue index 175e89a454b..d22fef27964 100644 --- a/app/assets/javascripts/ci_variable_list/components/ci_environments_dropdown.vue +++ b/app/assets/javascripts/ci_variable_list/components/ci_environments_dropdown.vue @@ -1,20 +1,20 @@ <script> import { - GlDropdown, - GlDropdownItem, - GlDropdownDivider, + GlDeprecatedDropdown, + GlDeprecatedDropdownItem, + GlDeprecatedDropdownDivider, GlSearchBoxByType, GlIcon, } from '@gitlab/ui'; -import { __, sprintf } from '~/locale'; import { mapGetters } from 'vuex'; +import { __, sprintf } from '~/locale'; export default { name: 'CiEnvironmentsDropdown', components: { - GlDropdown, - GlDropdownItem, - GlDropdownDivider, + GlDeprecatedDropdown, + GlDeprecatedDropdownItem, + GlDeprecatedDropdownDivider, GlSearchBoxByType, GlIcon, }, @@ -66,9 +66,9 @@ export default { }; </script> <template> - <gl-dropdown :text="value"> + <gl-deprecated-dropdown :text="value"> <gl-search-box-by-type v-model.trim="searchTerm" class="m-2" /> - <gl-dropdown-item + <gl-deprecated-dropdown-item v-for="environment in filteredResults" :key="environment" @click="selectEnvironment(environment)" @@ -79,15 +79,15 @@ export default { class="vertical-align-middle" /> {{ environment }} - </gl-dropdown-item> - <gl-dropdown-item v-if="!filteredResults.length" ref="noMatchingResults">{{ + </gl-deprecated-dropdown-item> + <gl-deprecated-dropdown-item v-if="!filteredResults.length" ref="noMatchingResults">{{ __('No matching results') - }}</gl-dropdown-item> + }}</gl-deprecated-dropdown-item> <template v-if="shouldRenderCreateButton"> - <gl-dropdown-divider /> - <gl-dropdown-item @click="createClicked"> + <gl-deprecated-dropdown-divider /> + <gl-deprecated-dropdown-item @click="createClicked"> {{ composedCreateButtonLabel }} - </gl-dropdown-item> + </gl-deprecated-dropdown-item> </template> - </gl-dropdown> + </gl-deprecated-dropdown> </template> |