diff options
author | Natalia Tepluhina <tarya.se@gmail.com> | 2018-12-13 14:26:06 +0300 |
---|---|---|
committer | Natalia Tepluhina <tarya.se@gmail.com> | 2018-12-13 15:05:45 +0300 |
commit | 421b3a158a8976ccf21cd1bb2bc70a281a40c25d (patch) | |
tree | 4517df5f0ec8d59112f3b76900a2b143d4033674 /app/assets/javascripts/vue_shared/components/user_popover | |
parent | 1ef4496468067f9d149e93cb907d750b164de35a (diff) |
Prevent escaping in user tooltip
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 | 20 |
1 files changed, 13 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 7fbadcc0111..d5ee524ea78 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 @@ -30,10 +30,14 @@ export default { computed: { jobLine() { if (this.user.bio && this.user.organization) { - return sprintf(__('%{bio} at %{organization}'), { - bio: this.user.bio, - organization: this.user.organization, - }); + return sprintf( + __('%{bio} at %{organization}'), + { + bio: this.user.bio, + organization: this.user.organization, + }, + false, + ); } else if (this.user.bio) { return this.user.bio; } else if (this.user.organization) { @@ -66,7 +70,7 @@ export default { <gl-popover :target="target" boundary="viewport" placement="top" 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" /> + <user-avatar-image :img-src="user.avatarUrl" :size="60" css-classes="mr-2"/> </div> <div class="p-1 w-100"> <h5 class="m-0"> @@ -79,7 +83,7 @@ export default { </h5> <div class="text-secondary mb-2"> <span v-if="user.username">@{{ user.username }}</span> - <gl-skeleton-loading v-else :lines="1" class="animation-container-small mb-1" /> + <gl-skeleton-loading v-else :lines="1" class="animation-container-small mb-1"/> </div> <div class="text-secondary"> {{ jobLine }} @@ -97,7 +101,9 @@ export default { class="animation-container-small mb-1" /> </div> - <div v-if="user.status" class="mt-2"><span v-html="statusHtml"></span></div> + <div v-if="user.status" class="mt-2"> + <span v-html="statusHtml"></span> + </div> </div> </div> </gl-popover> |