diff options
| author | Dennis Tang <750946-dennis@users.noreply.gitlab.com> | 2019-02-04 12:17:27 +0000 |
|---|---|---|
| committer | Dennis Tang <750946-dennis@users.noreply.gitlab.com> | 2019-02-04 12:17:27 +0000 |
| commit | 7c758abc3a9cec034902865df3a57ca807083e25 (patch) | |
| tree | 4330f16b8900cbd9520c8b8e74b85b6347f00776 | |
| parent | 3424476b4c9f17c11b969ab00e9be80f8c635c02 (diff) | |
| download | gitlab-ce-dennis-11-7-user-status-message.tar.gz | |
Update user popover status property to display properly escaped message dennis-11-7-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 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 ''; }, |