diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-21 03:09:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-21 03:09:18 +0300 |
commit | 1ccf61bdccd3f0cbcabd7fe335542014f465f46b (patch) | |
tree | f6eb90ccf27bb2193251d1617e7b655429eb2ac6 /app/serializers | |
parent | 68f1860e6f1f9e8441c434f4e62238c359ce8c7c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/note_user_entity.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/serializers/note_user_entity.rb b/app/serializers/note_user_entity.rb index b00dfa7d353..ffaf7664dae 100644 --- a/app/serializers/note_user_entity.rb +++ b/app/serializers/note_user_entity.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true class NoteUserEntity < UserEntity + expose :gitlab_employee?, as: :is_gitlab_employee, if: ->(user, options) { ::Feature.enabled?(:gitlab_employee_badge) && user.gitlab_employee? } + unexpose :web_url end |