Commit 421b3a15 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Prevent escaping in user tooltip

parent 1ef44964
...@@ -30,10 +30,14 @@ export default { ...@@ -30,10 +30,14 @@ export default {
computed: { computed: {
jobLine() { jobLine() {
if (this.user.bio && this.user.organization) { if (this.user.bio && this.user.organization) {
return sprintf(__('%{bio} at %{organization}'), { return sprintf(
bio: this.user.bio, __('%{bio} at %{organization}'),
organization: this.user.organization, {
}); bio: this.user.bio,
organization: this.user.organization,
},
false,
);
} else if (this.user.bio) { } else if (this.user.bio) {
return this.user.bio; return this.user.bio;
} else if (this.user.organization) { } else if (this.user.organization) {
...@@ -66,7 +70,7 @@ export default { ...@@ -66,7 +70,7 @@ export default {
<gl-popover :target="target" boundary="viewport" placement="top" show> <gl-popover :target="target" boundary="viewport" placement="top" show>
<div class="user-popover d-flex"> <div class="user-popover d-flex">
<div class="p-1 flex-shrink-1"> <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>
<div class="p-1 w-100"> <div class="p-1 w-100">
<h5 class="m-0"> <h5 class="m-0">
...@@ -79,7 +83,7 @@ export default { ...@@ -79,7 +83,7 @@ export default {
</h5> </h5>
<div class="text-secondary mb-2"> <div class="text-secondary mb-2">
<span v-if="user.username">@{{ user.username }}</span> <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>
<div class="text-secondary"> <div class="text-secondary">
{{ jobLine }} {{ jobLine }}
...@@ -97,7 +101,9 @@ export default { ...@@ -97,7 +101,9 @@ export default {
class="animation-container-small mb-1" class="animation-container-small mb-1"
/> />
</div> </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>
</div> </div>
</gl-popover> </gl-popover>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment