diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-02 12:11:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-02 12:11:35 +0300 |
| commit | ed0d55ded7a03c8d5da501d3c86b38084f695cae (patch) | |
| tree | 8612868b90f496a1dacc29c1a7a78cd7d380a26b /app/assets/javascripts/vue_shared/components/user_popover | |
| parent | 951a32fcf3fc8766eae1430a389b77049410c371 (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 | 9 |
1 files changed, 6 insertions, 3 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 f387f8ca128..11379534662 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 @@ -1,5 +1,4 @@ <script> -/* eslint-disable vue/no-v-html */ import { GlPopover, GlLink, GlSkeletonLoader, GlIcon } from '@gitlab/ui'; import UserNameWithStatus from '~/sidebar/components/assignees/user_name_with_status.vue'; import { glEmojiTag } from '../../../emoji'; @@ -83,7 +82,11 @@ export default { <div class="gl-text-gray-500"> <div v-if="user.bio" class="gl-display-flex gl-mb-2"> <gl-icon name="profile" class="gl-text-gray-400 gl-flex-shrink-0" /> - <span ref="bio" class="gl-ml-2 gl-overflow-hidden" v-html="user.bioHtml"></span> + <span + ref="bio" + class="gl-ml-2 gl-overflow-hidden" + v-html="user.bioHtml /* eslint-disable-line vue/no-v-html */" + ></span> </div> <div v-if="user.workInformation" class="gl-display-flex gl-mb-2"> <gl-icon name="work" class="gl-text-gray-400 gl-flex-shrink-0" /> @@ -95,7 +98,7 @@ export default { <span class="gl-ml-2">{{ user.location }}</span> </div> <div v-if="statusHtml" class="js-user-status gl-mt-3"> - <span v-html="statusHtml"></span> + <span v-html="statusHtml /* eslint-disable-line vue/no-v-html */"></span> </div> <div v-if="user.bot" class="gl-text-blue-500"> <gl-icon name="question" /> |