From d6024427e8036c93ccf04759a3725167ec6c02f4 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 28 Apr 2021 09:10:13 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/helpers/page_layout_helper.rb | 1 -
 1 file changed, 1 deletion(-)

(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 6997c8cffda..2729951d685 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -162,7 +162,6 @@ module PageLayoutHelper
     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
     }
 
-- 
cgit v1.2.3