diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-30 21:09:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-30 21:09:46 +0300 |
commit | ace0df53d3ed38344b470727d430484d24eeb798 (patch) | |
tree | ec1fc71d793bf3d588df9fe97c4649c87e697e73 /app/helpers/profiles_helper.rb | |
parent | 56eafa995d0bbda39bc24cd07537286bf36a4dd9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/profiles_helper.rb')
-rw-r--r-- | app/helpers/profiles_helper.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/helpers/profiles_helper.rb b/app/helpers/profiles_helper.rb index 04a3b915493..87187e97df4 100644 --- a/app/helpers/profiles_helper.rb +++ b/app/helpers/profiles_helper.rb @@ -37,10 +37,4 @@ module ProfilesHelper def user_status_set_to_busy?(status) status&.availability == availability_values[:busy] end - - def show_status_emoji?(status) - return false unless status - - status.message.present? || status.emoji != UserStatus::DEFAULT_EMOJI - end end |