Commit 993c40dc authored by Robert Hunt's avatar Robert Hunt

Merge branch 'dz/355854-update-pipeline-trigger-avatar-size' into 'master'

Migrate UsersAvatarLink to standard Pajamas components

See merge request gitlab-org/gitlab!83887
parents 4a25e415 2bce262e
<script> <script>
import { GlTable, GlButton, GlBadge, GlTooltipDirective } from '@gitlab/ui'; import { GlTable, GlButton, GlBadge, GlTooltipDirective, GlAvatarLink, GlAvatar } from '@gitlab/ui';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
export default { export default {
i18n: { i18n: {
...@@ -21,7 +20,8 @@ export default { ...@@ -21,7 +20,8 @@ export default {
GlBadge, GlBadge,
ClipboardButton, ClipboardButton,
TooltipOnTruncate, TooltipOnTruncate,
UserAvatarLink, GlAvatarLink,
GlAvatar,
TimeAgoTooltip, TimeAgoTooltip,
}, },
directives: { directives: {
...@@ -102,13 +102,14 @@ export default { ...@@ -102,13 +102,14 @@ export default {
</template> </template>
<template #cell(owner)="{ item }"> <template #cell(owner)="{ item }">
<span class="trigger-owner sr-only">{{ item.owner.name }}</span> <span class="trigger-owner sr-only">{{ item.owner.name }}</span>
<user-avatar-link <gl-avatar-link
v-if="item.owner" v-if="item.owner"
:link-href="item.owner.path" v-gl-tooltip
:img-src="item.owner.avatarUrl" :href="item.owner.path"
:tooltip-text="item.owner.name" :title="item.owner.name"
:img-alt="item.owner.name" >
/> <gl-avatar :size="24" :src="item.owner.avatarUrl" />
</gl-avatar-link>
</template> </template>
<template #cell(lastUsed)="{ item }"> <template #cell(lastUsed)="{ item }">
<time-ago-tooltip v-if="item.lastUsed" :time="item.lastUsed" /> <time-ago-tooltip v-if="item.lastUsed" :time="item.lastUsed" />
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment