Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42

1 files changed, 3 insertions, 3 deletions

diff --git a/app/assets/javascripts/super_sidebar/components/user_name_group.vue b/app/assets/javascripts/super_sidebar/components/user_name_group.vue
index dfaaaccf4a4..f3e8816cd37 100644
--- a/app/assets/javascripts/super_sidebar/components/user_name_group.vue
+++ b/app/assets/javascripts/super_sidebar/components/user_name_group.vue
@@ -41,7 +41,7 @@ export default {
         item.extraAttrs = {
           ...USER_MENU_TRACKING_DEFAULTS,
           'data-track-label': 'user_profile',
-          'data-qa-selector': 'user_profile_link',
+          'data-testid': 'user_profile_link',
         };
       }
 
@@ -74,13 +74,13 @@ export default {
             class="gl-display-flex gl-align-items-center gl-mt-2 gl-font-sm"
           >
             <gl-emoji :data-name="user.status.emoji" class="gl-mr-1" />
-            <span v-safe-html="user.status.message" class="gl-text-truncate"></span>
+            <span v-safe-html="user.status.message_html" class="gl-text-truncate"></span>
             <gl-tooltip
               :target="() => $refs.statusTooltipTarget"
               boundary="viewport"
               placement="bottom"
             >
-              <span v-safe-html="user.status.message"></span>
+              <span v-safe-html="user.status.message_html"></span>
             </gl-tooltip>
           </span>
         </span>