diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 21:09:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 21:09:56 +0000 |
| commit | c1a50b8195f4e36fda9b233acbde57a449bcf6c3 (patch) | |
| tree | b24a10a7951e9a799397753d1badf6894fe03089 /app/serializers | |
| parent | b6847c621ff246e6abceb90545d5a608318762d6 (diff) | |
| download | gitlab-ce-c1a50b8195f4e36fda9b233acbde57a449bcf6c3.tar.gz | |
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, 1 insertions, 1 deletions
diff --git a/app/serializers/note_user_entity.rb b/app/serializers/note_user_entity.rb index ffaf7664dae..8d30bbff5e4 100644 --- a/app/serializers/note_user_entity.rb +++ b/app/serializers/note_user_entity.rb @@ -1,7 +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? } + expose :gitlab_employee?, as: :is_gitlab_employee, if: ->(user, options) { user.gitlab_employee? } unexpose :web_url end |