diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-18 15:10:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-18 15:10:03 +0300 |
commit | 38a1a6cb91bd4cd95d18db9a4bfd219bfb75401b (patch) | |
tree | 7b3d217aa21180af6256b99a8a6ba76775edd4b8 /app/assets/javascripts/vue_shared/components/user_popover | |
parent | e6779ab919283efbd93a0e3ed2356c58b19f9c93 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/user_popover')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue index deac24d2270..f387f8ca128 100644 --- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue +++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue @@ -72,7 +72,11 @@ export default { <template v-else> <div class="gl-mb-3"> <h5 class="gl-m-0"> - <user-name-with-status :name="user.name" :availability="availabilityStatus" /> + <user-name-with-status + :name="user.name" + :availability="availabilityStatus" + :pronouns="user.pronouns" + /> </h5> <span class="gl-text-gray-500">@{{ user.username }}</span> </div> |