diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-28 12:10:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-28 12:10:13 +0300 |
| commit | d6024427e8036c93ccf04759a3725167ec6c02f4 (patch) | |
| tree | f722805d09e3cf62c76f384bbaae9dccfa6f755e /app/helpers/page_layout_helper.rb | |
| parent | c7836133e0d9287e147e9e19099e058a37e87a9a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
| -rw-r--r-- | app/helpers/page_layout_helper.rb | 1 |
1 files changed, 0 insertions, 1 deletions
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 } |