From 8106ac487c3b52471e2ca894c65c13162c2fb1a8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 14 Jan 2021 15:10:46 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/helpers/page_layout_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers') diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index e3d82e7a091..8920133734c 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -159,7 +159,7 @@ module PageLayoutHelper 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 } + default_properties = { current_emoji: '', current_message: '', can_set_user_availability: Feature.enabled?(:set_user_availability_status, user, default_enabled: :yaml), default_emoji: UserStatus::DEFAULT_EMOJI } return default_properties unless user&.status default_properties.merge({ -- cgit v1.2.3