diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 21:06:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 21:06:14 +0000 |
| commit | c324100967bbdd3f2f0ca3406c9261d35e69f148 (patch) | |
| tree | ecfd5d521d90792cbc922309e6930b1ba2badff6 /app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue | |
| parent | d8ccc7a00b7a1ea954263170a2044257424a2cfe (diff) | |
| download | gitlab-ce-c324100967bbdd3f2f0ca3406c9261d35e69f148.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue | 4 |
1 files changed, 2 insertions, 2 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 7c7d46ee759..4a72cca5f02 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 @@ -51,7 +51,7 @@ export default { </script> <template> - <gl-popover :target="target" boundary="viewport" placement="top" show> + <gl-popover :target="target" boundary="viewport" placement="top" offset="0, 1" show> <div class="user-popover d-flex"> <div class="p-1 flex-shrink-1"> <user-avatar-image :img-src="user.avatarUrl" :size="60" css-classes="mr-2" /> @@ -90,7 +90,7 @@ export default { name="location" class="category-icon flex-shrink-0" /> - <span class="ml-1">{{ user.location }}</span> + <span v-if="user.location" class="ml-1">{{ user.location }}</span> <gl-skeleton-loading v-if="locationIsLoading" :lines="1" |