diff options
| author | Dennis Tang <750946-dennis@users.noreply.gitlab.com> | 2019-02-04 12:17:39 +0000 |
|---|---|---|
| committer | Dennis Tang <750946-dennis@users.noreply.gitlab.com> | 2019-02-04 12:17:39 +0000 |
| commit | 05539f96d6ac738c19f82590c82a7e82f396dccd (patch) | |
| tree | 22283c48722936d54fd300582fb63891679ab7da | |
| parent | 977a9de700f6e9d0b51cec99bf223fdf98a0d0ea (diff) | |
| download | gitlab-ce-dennis-11-6-user-status-message.tar.gz | |
Update user popover status property to display properly escaped message dennis-11-6-user-status-message
| -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 fad1a2f3f56..50e8eb82e21 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 @@ -46,10 +46,10 @@ export default { return null; }, 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 ''; }, |