Commit 6ef24415 authored by Rajendra Kadam's avatar Rajendra Kadam Committed by Peter Leitzen

Move include to last line for EE

parent 5c94a189
---
title: Move include_if_ee to last line in ee/app 1
merge_request: 31832
author: Rajendra Kadam
type: fixed
...@@ -10,14 +10,12 @@ module EE ...@@ -10,14 +10,12 @@ module EE
extend ::Gitlab::Utils::Override extend ::Gitlab::Utils::Override
extend ::Gitlab::Cache::RequestCache extend ::Gitlab::Cache::RequestCache
include ::Gitlab::Utils::StrongMemoize include ::Gitlab::Utils::StrongMemoize
include ::EE::GitlabRoutingHelper # rubocop: disable Cop/InjectEnterpriseEditionModule
include IgnorableColumns include IgnorableColumns
GIT_LFS_DOWNLOAD_OPERATION = 'download'.freeze GIT_LFS_DOWNLOAD_OPERATION = 'download'.freeze
prepended do prepended do
include Elastic::ProjectsSearch include Elastic::ProjectsSearch
include EE::DeploymentPlatform # rubocop: disable Cop/InjectEnterpriseEditionModule
include EachBatch include EachBatch
include InsightsFeature include InsightsFeature
include DeprecatedApprovalsBeforeMerge include DeprecatedApprovalsBeforeMerge
...@@ -784,3 +782,6 @@ module EE ...@@ -784,3 +782,6 @@ module EE
end end
end end
end end
EE::Project.include_if_ee('::EE::GitlabRoutingHelper')
EE::Project.include_if_ee('::EE::DeploymentPlatform')
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
module EE module EE
module MergeRequestPresenter module MergeRequestPresenter
include ::VisibleApprovable include ::VisibleApprovable
include ::EE::ProjectsHelper # rubocop: disable Cop/InjectEnterpriseEditionModule
def approvals_path def approvals_path
if expose_mr_approval_path? if expose_mr_approval_path?
...@@ -72,3 +71,5 @@ module EE ...@@ -72,3 +71,5 @@ module EE
end end
end end
end end
EE::MergeRequestPresenter.include_if_ee('::EE::ProjectsHelper')
# frozen_string_literal: true # frozen_string_literal: true
class Vulnerabilities::FindingEntity < Grape::Entity class Vulnerabilities::FindingEntity < Grape::Entity
include ::EE::ProjectsHelper # rubocop: disable Cop/InjectEnterpriseEditionModule
include RequestAwareEntity include RequestAwareEntity
expose :id, :report_type, :name, :severity, :confidence expose :id, :report_type, :name, :severity, :confidence
...@@ -44,3 +43,5 @@ class Vulnerabilities::FindingEntity < Grape::Entity ...@@ -44,3 +43,5 @@ class Vulnerabilities::FindingEntity < Grape::Entity
return request.current_user if request.respond_to?(:current_user) return request.current_user if request.respond_to?(:current_user)
end end
end end
Vulnerabilities::FindingEntity.include_if_ee('::EE::ProjectsHelper')
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment