From 6535cf9c79362862c31ea7d26c61541b84db18d9 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 17 Nov 2020 15:09:28 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/helpers/page_layout_helper.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'app/helpers/page_layout_helper.rb')

diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index e39dfa44d86..e3d82e7a091 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -158,6 +158,17 @@ module PageLayoutHelper
     end
   end
 
+  def user_status_properties(user)
+    default_properties = { current_emoji: '', current_message: '', can_set_user_availability: Feature.enabled?(:set_user_availability_status, user), default_emoji: UserStatus::DEFAULT_EMOJI }
+    return default_properties unless user&.status
+
+    default_properties.merge({
+      current_emoji: user.status.emoji.to_s,
+      current_message: user.status.message.to_s,
+      current_availability: user.status.availability.to_s
+    })
+  end
+
   private
 
   def generic_canonical_url
-- 
cgit v1.2.3