diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-25 03:09:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-25 03:09:23 +0300 |
commit | dcb475d86c5e2899ad65bf3d53adfd70fa1a82ef (patch) | |
tree | c99bf04dc47dd93b31f1e0f9d0f2f21473dfba74 /app/assets/javascripts/ci_variable_list | |
parent | 5f23ef4ecaf902912d57c577429086b6e991b6eb (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ci_variable_list')
-rw-r--r-- | app/assets/javascripts/ci_variable_list/components/ci_environments_dropdown.vue | 30 |
1 files changed, 15 insertions, 15 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..993251a6e41 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,8 +1,8 @@ <script> import { - GlDropdown, - GlDropdownItem, - GlDropdownDivider, + GlDeprecatedDropdown, + GlDeprecatedDropdownItem, + GlDeprecatedDropdownDivider, GlSearchBoxByType, GlIcon, } from '@gitlab/ui'; @@ -12,9 +12,9 @@ import { mapGetters } from 'vuex'; 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> |