diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-10-01 20:38:31 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-10-01 20:38:31 +0000 |
| commit | 4ad247fdf09825c2f03b47c1fa17f4362fdd0401 (patch) | |
| tree | 588e8c4242ee619f7ddbcc03de5f4728f2bfb092 | |
| parent | c9375e63d8032ea0dee0fc8699e7c08b6722c5e1 (diff) | |
| parent | a9f1ef272b9cc39022e41a14b9e3cdcfa53ca071 (diff) | |
| download | gitlab-ce-4ad247fdf09825c2f03b47c1fa17f4362fdd0401.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/add-gl-link-to-user-avatar-link.yml | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue index 08e102e57c3..ee3157bcb1b 100644 --- a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue +++ b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue @@ -18,12 +18,14 @@ */ +import { Link } from '@gitlab-org/gitlab-ui'; import userAvatarImage from './user_avatar_image.vue'; import tooltip from '../../directives/tooltip'; export default { name: 'UserAvatarLink', components: { + 'gl-link': Link, userAvatarImage, }, directives: { @@ -83,7 +85,7 @@ export default { </script> <template> - <a + <gl-link :href="linkHref" class="user-avatar-link"> <user-avatar-image @@ -99,5 +101,5 @@ export default { :title="tooltipText" :tooltip-placement="tooltipPlacement" >{{ username }}</span> - </a> + </gl-link> </template> diff --git a/changelogs/unreleased/add-gl-link-to-user-avatar-link.yml b/changelogs/unreleased/add-gl-link-to-user-avatar-link.yml new file mode 100644 index 00000000000..ef87ef541dd --- /dev/null +++ b/changelogs/unreleased/add-gl-link-to-user-avatar-link.yml @@ -0,0 +1,5 @@ +--- +title: Add link component to UserAvatarLink component +merge_request: 21986 +author: George Tsiolis +type: other |