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/confidential_merge_request | |
parent | 5f23ef4ecaf902912d57c577429086b6e991b6eb (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/confidential_merge_request')
-rw-r--r-- | app/assets/javascripts/confidential_merge_request/components/dropdown.vue | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/app/assets/javascripts/confidential_merge_request/components/dropdown.vue b/app/assets/javascripts/confidential_merge_request/components/dropdown.vue index 92a5423d5ea..b8163ecfab2 100644 --- a/app/assets/javascripts/confidential_merge_request/components/dropdown.vue +++ b/app/assets/javascripts/confidential_merge_request/components/dropdown.vue @@ -1,12 +1,12 @@ <script> -import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; +import { GlDeprecatedDropdown, GlDeprecatedDropdownItem } from '@gitlab/ui'; import { __ } from '~/locale'; import Icon from '~/vue_shared/components/icon.vue'; export default { components: { - GlDropdown, - GlDropdownItem, + GlDeprecatedDropdown, + GlDeprecatedDropdownItem, Icon, }, props: { @@ -38,7 +38,7 @@ export default { </script> <template> - <gl-dropdown toggle-class="d-flex align-items-center w-100" class="w-100"> + <gl-deprecated-dropdown toggle-class="d-flex align-items-center w-100" class="w-100"> <template #button-content> <span class="str-truncated-100 mr-2"> <icon name="lock" /> @@ -46,13 +46,17 @@ export default { </span> <icon name="chevron-down" class="ml-auto" /> </template> - <gl-dropdown-item v-for="project in projects" :key="project.id" @click="selectProject(project)"> + <gl-deprecated-dropdown-item + v-for="project in projects" + :key="project.id" + @click="selectProject(project)" + > <icon name="mobile-issue-close" :class="{ icon: project.id !== selectedProject.id }" class="js-active-project-check" /> <span class="ml-1">{{ project.name }}</span> - </gl-dropdown-item> - </gl-dropdown> + </gl-deprecated-dropdown-item> + </gl-deprecated-dropdown> </template> |