From 05539f96d6ac738c19f82590c82a7e82f396dccd Mon Sep 17 00:00:00 2001
From: Dennis Tang <750946-dennis@users.noreply.gitlab.com>
Date: Mon, 4 Feb 2019 12:17:39 +0000
Subject: Update user popover status property to display properly escaped
 message

---
 .../vue_shared/components/user_popover/user_popover.vue           | 8 ++++----
 1 file 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 '';
     },
-- 
cgit v1.2.3