Commit 4ad247fd authored by Clement Ho's avatar Clement Ho

Merge branch 'add-gl-link-to-user-avatar-link' into 'master'

Add link component to user avatar link component

See merge request gitlab-org/gitlab-ce!21986
parents c9375e63 a9f1ef27
...@@ -18,12 +18,14 @@ ...@@ -18,12 +18,14 @@
*/ */
import { Link } from '@gitlab-org/gitlab-ui';
import userAvatarImage from './user_avatar_image.vue'; import userAvatarImage from './user_avatar_image.vue';
import tooltip from '../../directives/tooltip'; import tooltip from '../../directives/tooltip';
export default { export default {
name: 'UserAvatarLink', name: 'UserAvatarLink',
components: { components: {
'gl-link': Link,
userAvatarImage, userAvatarImage,
}, },
directives: { directives: {
...@@ -83,7 +85,7 @@ export default { ...@@ -83,7 +85,7 @@ export default {
</script> </script>
<template> <template>
<a <gl-link
:href="linkHref" :href="linkHref"
class="user-avatar-link"> class="user-avatar-link">
<user-avatar-image <user-avatar-image
...@@ -99,5 +101,5 @@ export default { ...@@ -99,5 +101,5 @@ export default {
:title="tooltipText" :title="tooltipText"
:tooltip-placement="tooltipPlacement" :tooltip-placement="tooltipPlacement"
>{{ username }}</span> >{{ username }}</span>
</a> </gl-link>
</template> </template>
---
title: Add link component to UserAvatarLink component
merge_request: 21986
author: George Tsiolis
type: other
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