Merge branch 'ee-app-1' into 'master'

Move include to last line for EE

See merge request gitlab-org/gitlab!31832

changelogs/unreleased/ee-app-1.yml

+---
+title: Move include_if_ee to last line in ee/app 1
+merge_request: 31832
+author: Rajendra Kadam
+type: fixed

ee/app/models/ee/project.rb

@@ -10,14 +10,12 @@ module EE
     extend ::Gitlab::Utils::Override
     extend ::Gitlab::Cache::RequestCache
     include ::Gitlab::Utils::StrongMemoize
-    include ::EE::GitlabRoutingHelper # rubocop: disable Cop/InjectEnterpriseEditionModule
     include IgnorableColumns
 
     GIT_LFS_DOWNLOAD_OPERATION = 'download'.freeze
 
     prepended do
       include Elastic::ProjectsSearch
-      include EE::DeploymentPlatform # rubocop: disable Cop/InjectEnterpriseEditionModule
       include EachBatch
       include InsightsFeature
       include DeprecatedApprovalsBeforeMerge
@@ -784,3 +782,6 @@ module EE
     end
   end
 end
+
+EE::Project.include_if_ee('::EE::GitlabRoutingHelper')
+EE::Project.include_if_ee('::EE::DeploymentPlatform')

ee/app/presenters/ee/merge_request_presenter.rb

@@ -3,7 +3,6 @@
 module EE
   module MergeRequestPresenter
     include ::VisibleApprovable
-    include ::EE::ProjectsHelper # rubocop: disable Cop/InjectEnterpriseEditionModule
 
     def approvals_path
       if expose_mr_approval_path?
@@ -72,3 +71,5 @@ module EE
     end
   end
 end
+
+EE::MergeRequestPresenter.include_if_ee('::EE::ProjectsHelper')

ee/app/serializers/vulnerabilities/finding_entity.rb

 # frozen_string_literal: true
 
 class Vulnerabilities::FindingEntity < Grape::Entity
-  include ::EE::ProjectsHelper # rubocop: disable Cop/InjectEnterpriseEditionModule
   include RequestAwareEntity
 
   expose :id, :report_type, :name, :severity, :confidence
@@ -44,3 +43,5 @@ class Vulnerabilities::FindingEntity < Grape::Entity
     return request.current_user if request.respond_to?(:current_user)
   end
 end
+
+Vulnerabilities::FindingEntity.include_if_ee('::EE::ProjectsHelper')