diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/assets/javascripts/pipelines/components/pipelines_list/pipeline_triggerer.vue | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/assets/javascripts/pipelines/components/pipelines_list/pipeline_triggerer.vue')
-rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_list/pipeline_triggerer.vue | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_triggerer.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_triggerer.vue index b29c8426301..2a73795db0a 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_triggerer.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_triggerer.vue @@ -1,10 +1,14 @@ <script> -import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; +import { GlAvatarLink, GlAvatar, GlTooltipDirective } from '@gitlab/ui'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; export default { components: { - UserAvatarLink, + GlAvatarLink, + GlAvatar, + }, + directives: { + GlTooltip: GlTooltipDirective, }, mixins: [glFeatureFlagMixin()], props: { @@ -22,15 +26,11 @@ export default { </script> <template> <div class="pipeline-triggerer" data-testid="pipeline-triggerer"> - <user-avatar-link - v-if="user" - :link-href="user.path" - :img-src="user.avatar_url" - :img-size="32" - :tooltip-text="user.name" - class="gl-ml-3 js-pipeline-url-user" - /> - <span v-else class="gl-ml-3 js-pipeline-url-api api"> + <gl-avatar-link v-if="user" v-gl-tooltip :href="user.path" :title="user.name" class="gl-ml-3"> + <gl-avatar :size="32" :src="user.avatar_url" /> + </gl-avatar-link> + + <span v-else class="gl-ml-3"> {{ s__('Pipelines|API') }} </span> </div> |