summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_shared/components/user_avatar
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 09:09:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 09:09:31 +0000
commit04baa85554ff13bdd4d6f4e6bb24119d17608fee (patch)
tree7cb9c0977e09d97da340f48703d79b2dbd3579a0 /app/assets/javascripts/vue_shared/components/user_avatar
parent42f41de46525ce0065f02ee07c1a79f5669526a0 (diff)
downloadgitlab-ce-04baa85554ff13bdd4d6f4e6bb24119d17608fee.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/user_avatar')
-rw-r--r--app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue12
1 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue
index 8eaf8386b99..db378d6f977 100644
--- a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue
+++ b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue
@@ -1,12 +1,12 @@
<script>
-import { GlButton } from '@gitlab/ui';
+import { GlDeprecatedButton } from '@gitlab/ui';
import { sprintf, __ } from '~/locale';
import UserAvatarLink from './user_avatar_link.vue';
export default {
components: {
UserAvatarLink,
- GlButton,
+ GlDeprecatedButton,
},
props: {
items: {
@@ -82,8 +82,12 @@ export default {
:img-size="imgSize"
/>
<template v-if="hasBreakpoint">
- <gl-button v-if="hasHiddenItems" variant="link" @click="expand"> {{ expandText }} </gl-button>
- <gl-button v-else variant="link" @click="collapse"> {{ __('show less') }} </gl-button>
+ <gl-deprecated-button v-if="hasHiddenItems" variant="link" @click="expand">
+ {{ expandText }}
+ </gl-deprecated-button>
+ <gl-deprecated-button v-else variant="link" @click="collapse">
+ {{ __('show less') }}
+ </gl-deprecated-button>
</template>
</div>
</template>