Merge branch '58275-rename-project-entity-ee' into 'master'

Rename ProjectEntity to IssuableEntity

See merge request gitlab-org/gitlab-ee!14484

ee/lib/ee/api/entities.rb

@@ -363,35 +363,8 @@ module EE
         expose :user, using: ::API::Entities::UserBasic
       end
 
-      # @deprecated, replaced with ApprovalState
-      class MergeRequestApprovals < ::API::Entities::ProjectEntity
-        def initialize(merge_request, options = {})
-          presenter = merge_request.present(current_user: options[:current_user])
-
-          super(presenter, options)
-        end
-
-        expose :merge_status
-        expose :approvals_required
-        expose :approvals_left
-        expose :approvals, as: :approved_by, using: EE::API::Entities::Approvals
-        expose :approvers_left, as: :suggested_approvers, using: ::API::Entities::UserBasic
-        # @deprecated
-        expose :approvers, using: EE::API::Entities::Approver
-        # @deprecated
-        expose :approver_groups, using: EE::API::Entities::ApproverGroup
-
-        expose :user_has_approved do |merge_request, options|
-          merge_request.has_approved?(options[:current_user])
-        end
-
-        expose :user_can_approve do |merge_request, options|
-          merge_request.can_approve?(options[:current_user])
-        end
-      end
-
       class ApprovalState < Grape::Entity
-        expose :merge_request, merge: true, using: ::API::Entities::ProjectEntity
+        expose :merge_request, merge: true, using: ::API::Entities::IssuableEntity
         expose(:merge_status) { |approval_state| approval_state.merge_request.merge_status }
 
         expose :approved?, as: :approved

lib/api/entities.rb

@@ -511,7 +511,7 @@ module API
       end
     end
 
-    class ProjectEntity < Grape::Entity
+    class IssuableEntity < Grape::Entity
       expose :id, :iid
       expose(:project_id) { |entity| entity&.project.try(:id) }
       expose :title, :description
@@ -564,7 +564,7 @@ module API
       end
     end
 
-    class IssueBasic < ProjectEntity
+    class IssueBasic < IssuableEntity
       expose :closed_at
       expose :closed_by, using: Entities::UserBasic
 
@@ -670,14 +670,14 @@ module API
       end
     end
 
-    class MergeRequestSimple < ProjectEntity
+    class MergeRequestSimple < IssuableEntity
       expose :title
       expose :web_url do |merge_request, options|
         Gitlab::UrlBuilder.build(merge_request)
       end
     end
 
-    class MergeRequestBasic < ProjectEntity
+    class MergeRequestBasic < IssuableEntity
       expose :merged_by, using: Entities::UserBasic do |merge_request, _options|
         merge_request.metrics&.merged_by
       end

lib/api/import_github.rb

@@ -28,7 +28,7 @@ module API
 
     desc 'Import a GitHub project' do
       detail 'This feature was introduced in GitLab 11.3.4.'
-      success Entities::ProjectEntity
+      success ::ProjectEntity
     end
     params do
       requires :personal_access_token, type: String, desc: 'GitHub personal access token'