Add latest changes from gitlab-org/gitlab@master

3 files changed, 1 insertions, 20 deletions

diff --git a/lib/api/entities/discussion.rb b/lib/api/entities/discussion.rb
index 0740de97897..dd1dd40da23 100644
--- a/lib/api/entities/discussion.rb
+++ b/lib/api/entities/discussion.rb
@@ -5,7 +5,7 @@ module API
     class Discussion < Grape::Entity
       expose :id
       expose :individual_note?, as: :individual_note
-      expose :notes, using: Entities::NoteWithGitlabEmployeeBadge
+      expose :notes, using: Entities::Note
     end
   end
 end
diff --git a/lib/api/entities/note_with_gitlab_employee_badge.rb b/lib/api/entities/note_with_gitlab_employee_badge.rb
deleted file mode 100644
index 2ea300ffeb6..00000000000
--- a/lib/api/entities/note_with_gitlab_employee_badge.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module API
-  module Entities
-    class NoteWithGitlabEmployeeBadge < Note
-      expose :author, using: Entities::UserWithGitlabEmployeeBadge
-      expose :resolved_by, using: Entities::UserWithGitlabEmployeeBadge, if: ->(note, options) { note.resolvable? }
-    end
-  end
-end
diff --git a/lib/api/entities/user_with_gitlab_employee_badge.rb b/lib/api/entities/user_with_gitlab_employee_badge.rb
deleted file mode 100644
index 36b9f633132..00000000000
--- a/lib/api/entities/user_with_gitlab_employee_badge.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module API
-  module Entities
-    class UserWithGitlabEmployeeBadge < UserBasic
-      expose :gitlab_employee?, as: :is_gitlab_employee, if: ->(user, options) { ::Feature.enabled?(:gitlab_employee_badge) && user.gitlab_employee? }
-    end
-  end
-end