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/users_helper.rb | |
| parent | 56eafa995d0bbda39bc24cd07537286bf36a4dd9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/users_helper.rb')
| -rw-r--r-- | app/helpers/users_helper.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 08c88c39670..1786e632117 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -60,6 +60,12 @@ module UsersHelper "access:#{max_project_member_access(project)}" end + def show_status_emoji?(status) + return false unless status + + status.message.present? || status.emoji != UserStatus::DEFAULT_EMOJI + end + def user_status(user) return unless user |