Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-23 17:57:46 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-23 17:57:46 +0300
commit64fc6a9b19faca58ad0087b1a1cb11f7ed910015 (patch)
treefe4e98cfab4289850ee15965ae0b04648ee90207 /app/services/concerns
parent6317794da29af0bccf95dece5b57b2be2c0977a4 (diff)
Add latest changes from gitlab-org/gitlab@13-6-stable-ee
Diffstat (limited to 'app/services/concerns')
-rw-r--r--app/services/concerns/users/participable_service.rb3
1 files changed, 2 insertions, 1 deletions
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)