diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/serializers/concerns | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/serializers/concerns')
-rw-r--r-- | app/serializers/concerns/user_status_tooltip.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/serializers/concerns/user_status_tooltip.rb b/app/serializers/concerns/user_status_tooltip.rb index fcf6700cb59..ca2854224a7 100644 --- a/app/serializers/concerns/user_status_tooltip.rb +++ b/app/serializers/concerns/user_status_tooltip.rb @@ -16,6 +16,10 @@ module UserStatusTooltip status_loaded? && show_status_emoji?(user.status) end + expose :availability, if: -> (*) { status_loaded? } do |user| + user.status&.availability + end + private def status_loaded? |