diff options
| author | Dennis Tang <dtang@gitlab.com> | 2019-01-23 01:10:48 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-31 18:52:49 +0300 |
| commit | 1658f5b62e34b6ed6c7b4c6569bc4a849096af23 (patch) | |
| tree | 91b7eb56930b271d70e74fb48c86160c233c6baf /app | |
| parent | 88f2e9615cbb6ed976e65ca96af271d747ed8cce (diff) | |
Use sanitized user status message for user popover
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue | 8 |
1 files changed, 4 insertions, 4 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 d24fe1b547e..f9773622001 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 @@ -28,10 +28,10 @@ export default { }, computed: { statusHtml() { - if (this.user.status.emoji && this.user.status.message) { - return `${glEmojiTag(this.user.status.emoji)} ${this.user.status.message}`; - } else if (this.user.status.message) { - return this.user.status.message; + if (this.user.status.emoji && this.user.status.message_html) { + return `${glEmojiTag(this.user.status.emoji)} ${this.user.status.message_html}`; + } else if (this.user.status.message_html) { + return this.user.status.message_html; } return ''; }, |