From c1a50b8195f4e36fda9b233acbde57a449bcf6c3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 3 Apr 2020 21:09:56 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/serializers/note_user_entity.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/serializers') 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 -- cgit v1.2.3