diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 00:06:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 00:06:22 +0300 |
commit | 6d60f910762c1a92a07a4afaf1b26962f75ee4b6 (patch) | |
tree | 0a9ef6ccb20aa2099df33a409723eb912f8029e3 /app/assets/javascripts/vue_shared/components/user_popover | |
parent | de2ae3154f4ba1c23eeaa4ace41177ecd9b6005a (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 | 10 |
1 files changed, 3 insertions, 7 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 a60d5eb491e..7c7d46ee759 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 @@ -71,15 +71,11 @@ export default { </div> <div class="text-secondary"> <div v-if="user.bio" class="js-bio d-flex mb-1"> - <icon name="profile" css-classes="category-icon flex-shrink-0" /> + <icon name="profile" class="category-icon flex-shrink-0" /> <span class="ml-1">{{ user.bio }}</span> </div> <div v-if="user.organization" class="js-organization d-flex mb-1"> - <icon - v-show="!jobInfoIsLoading" - name="work" - css-classes="category-icon flex-shrink-0" - /> + <icon v-show="!jobInfoIsLoading" name="work" class="category-icon flex-shrink-0" /> <span class="ml-1">{{ user.organization }}</span> </div> <gl-skeleton-loading @@ -92,7 +88,7 @@ export default { <icon v-show="!locationIsLoading && user.location" name="location" - css-classes="category-icon flex-shrink-0" + class="category-icon flex-shrink-0" /> <span class="ml-1">{{ user.location }}</span> <gl-skeleton-loading |