From 64fc6a9b19faca58ad0087b1a1cb11f7ed910015 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 23 Nov 2020 14:57:46 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-6-stable-ee --- app/services/concerns/users/participable_service.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/services/concerns') diff --git a/app/services/concerns/users/participable_service.rb b/app/services/concerns/users/participable_service.rb index fac8e91d216..4f4032e77b9 100644 --- a/app/services/concerns/users/participable_service.rb +++ b/app/services/concerns/users/participable_service.rb @@ -46,8 +46,9 @@ module Users username: user.username, name: user.name, avatar_url: user.avatar_url, - availability: user&.status&.availability + availability: nil } + # Return nil for availability for now due to https://gitlab.com/gitlab-org/gitlab/-/issues/285442 end def group_as_hash(group, group_counts) -- cgit v1.2.3