Add latest changes from gitlab-org/gitlab@master

12 files changed, 24 insertions, 23 deletions

diff --git a/lib/gitlab/ci/status/build/failed.rb b/lib/gitlab/ci/status/build/failed.rb
index b0b01538a30..76ad113aad9 100644
--- a/lib/gitlab/ci/status/build/failed.rb
+++ b/lib/gitlab/ci/status/build/failed.rb
@@ -29,8 +29,6 @@ module Gitlab
 
           private_constant :REASONS
 
-          prepend_if_ee('::EE::Gitlab::Ci::Status::Build::Failed') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
           def status_tooltip
             base_message
           end
@@ -65,3 +63,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Ci::Status::Build::Failed.prepend_if_ee('::EE::Gitlab::Ci::Status::Build::Failed')
diff --git a/lib/gitlab/email/handler.rb b/lib/gitlab/email/handler.rb
index e9a7c9bcf5c..df9d4810ab3 100644
--- a/lib/gitlab/email/handler.rb
+++ b/lib/gitlab/email/handler.rb
@@ -3,8 +3,6 @@
 module Gitlab
   module Email
     module Handler
-      prepend_if_ee('::EE::Gitlab::Email::Handler') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
       def self.handlers
         @handlers ||= load_handlers
       end
@@ -27,3 +25,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Email::Handler.prepend_if_ee('::EE::Gitlab::Email::Handler')
diff --git a/lib/gitlab/github_import/parallel_importer.rb b/lib/gitlab/github_import/parallel_importer.rb
index 8fb99c996b3..1b4750da868 100644
--- a/lib/gitlab/github_import/parallel_importer.rb
+++ b/lib/gitlab/github_import/parallel_importer.rb
@@ -5,8 +5,6 @@ module Gitlab
     # The ParallelImporter schedules the importing of a GitHub project using
     # Sidekiq.
     class ParallelImporter
-      prepend_if_ee('::EE::Gitlab::GithubImport::ParallelImporter') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
       attr_reader :project
 
       def self.async?
@@ -41,3 +39,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::GithubImport::ParallelImporter.prepend_if_ee('::EE::Gitlab::GithubImport::ParallelImporter')
diff --git a/lib/gitlab/import_export/project/relation_factory.rb b/lib/gitlab/import_export/project/relation_factory.rb
index f7f1195f2f1..c5d99c9fced 100644
--- a/lib/gitlab/import_export/project/relation_factory.rb
+++ b/lib/gitlab/import_export/project/relation_factory.rb
@@ -4,8 +4,6 @@ module Gitlab
   module ImportExport
     module Project
       class RelationFactory < Base::RelationFactory
-        prepend_if_ee('::EE::Gitlab::ImportExport::Project::RelationFactory') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
         OVERRIDES = { snippets: :project_snippets,
                       ci_pipelines: 'Ci::Pipeline',
                       pipelines: 'Ci::Pipeline',
@@ -161,3 +159,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::ImportExport::Project::RelationFactory.prepend_if_ee('::EE::Gitlab::ImportExport::Project::RelationFactory')
diff --git a/lib/gitlab/middleware/read_only/controller.rb b/lib/gitlab/middleware/read_only/controller.rb
index cdab86540f8..1c49379e8d2 100644
--- a/lib/gitlab/middleware/read_only/controller.rb
+++ b/lib/gitlab/middleware/read_only/controller.rb
@@ -4,8 +4,6 @@ module Gitlab
   module Middleware
     class ReadOnly
       class Controller
-        prepend_if_ee('EE::Gitlab::Middleware::ReadOnly::Controller') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
         DISALLOWED_METHODS = %w(POST PATCH PUT DELETE).freeze
         APPLICATION_JSON = 'application/json'
         APPLICATION_JSON_TYPES = %W{#{APPLICATION_JSON} application/vnd.git-lfs+json}.freeze
@@ -144,3 +142,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Middleware::ReadOnly::Controller.prepend_if_ee('EE::Gitlab::Middleware::ReadOnly::Controller')
diff --git a/lib/gitlab/omniauth_initializer.rb b/lib/gitlab/omniauth_initializer.rb
index c051a581837..4a7a7709c79 100644
--- a/lib/gitlab/omniauth_initializer.rb
+++ b/lib/gitlab/omniauth_initializer.rb
@@ -2,8 +2,6 @@
 
 module Gitlab
   class OmniauthInitializer
-    prepend_if_ee('::EE::Gitlab::OmniauthInitializer') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
     def initialize(devise_config)
       @devise_config = devise_config
     end
@@ -121,3 +119,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::OmniauthInitializer.prepend_if_ee('::EE::Gitlab::OmniauthInitializer')
diff --git a/lib/gitlab/patch/draw_route.rb b/lib/gitlab/patch/draw_route.rb
index 4d1b57fbbbb..f5fcd5c6093 100644
--- a/lib/gitlab/patch/draw_route.rb
+++ b/lib/gitlab/patch/draw_route.rb
@@ -5,8 +5,6 @@
 module Gitlab
   module Patch
     module DrawRoute
-      prepend_if_ee('EE::Gitlab::Patch::DrawRoute') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
       RoutesNotFound = Class.new(StandardError)
 
       def draw(routes_name)
@@ -38,3 +36,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Patch::DrawRoute.prepend_if_ee('EE::Gitlab::Patch::DrawRoute')
diff --git a/lib/gitlab/prometheus/metric_group.rb b/lib/gitlab/prometheus/metric_group.rb
index 1b6f7282eb3..4a39260a340 100644
--- a/lib/gitlab/prometheus/metric_group.rb
+++ b/lib/gitlab/prometheus/metric_group.rb
@@ -3,7 +3,6 @@
 module Gitlab
   module Prometheus
     class MetricGroup
-      prepend_if_ee('EE::Gitlab::Prometheus::MetricGroup') # rubocop: disable Cop/InjectEnterpriseEditionModule
       include ActiveModel::Model
 
       attr_accessor :name, :priority, :metrics
@@ -31,3 +30,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Prometheus::MetricGroup.prepend_if_ee('EE::Gitlab::Prometheus::MetricGroup')
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
index a5e7d0ac9d5..d24b98e790b 100644
--- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb
+++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb
@@ -4,8 +4,6 @@ module Gitlab
   module Prometheus
     module Queries
       module QueryAdditionalMetrics
-        prepend_if_ee('EE::Gitlab::Prometheus::Queries::QueryAdditionalMetrics') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
         def query_metrics(project, environment, query_context)
           matched_metrics(project).map(&query_group(query_context))
             .select(&method(:group_with_any_metrics))
@@ -99,3 +97,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Prometheus::Queries::QueryAdditionalMetrics.prepend_if_ee('EE::Gitlab::Prometheus::Queries::QueryAdditionalMetrics')
diff --git a/lib/gitlab/search/parsed_query.rb b/lib/gitlab/search/parsed_query.rb
index f3136fff294..1f6e0519b4c 100644
--- a/lib/gitlab/search/parsed_query.rb
+++ b/lib/gitlab/search/parsed_query.rb
@@ -3,8 +3,6 @@
 module Gitlab
   module Search
     class ParsedQuery
-      prepend_if_ee('EE::Gitlab::Search::ParsedQuery') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
       attr_reader :term, :filters
 
       def initialize(term, filters)
@@ -25,3 +23,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Search::ParsedQuery.prepend_if_ee('EE::Gitlab::Search::ParsedQuery')
diff --git a/lib/gitlab/slash_commands/presenters/issue_base.rb b/lib/gitlab/slash_commands/presenters/issue_base.rb
index 4bc05d1f318..017fb8a62c4 100644
--- a/lib/gitlab/slash_commands/presenters/issue_base.rb
+++ b/lib/gitlab/slash_commands/presenters/issue_base.rb
@@ -4,8 +4,6 @@ module Gitlab
   module SlashCommands
     module Presenters
       module IssueBase
-        prepend_if_ee('EE::Gitlab::SlashCommands::Presenters::IssueBase') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
         def color(issuable)
           issuable.open? ? '#38ae67' : '#d22852'
         end
@@ -51,3 +49,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::SlashCommands::Presenters::IssueBase.prepend_if_ee('EE::Gitlab::SlashCommands::Presenters::IssueBase')
diff --git a/lib/gitlab/tree_summary.rb b/lib/gitlab/tree_summary.rb
index 724341c9cee..9861ea7d322 100644
--- a/lib/gitlab/tree_summary.rb
+++ b/lib/gitlab/tree_summary.rb
@@ -2,8 +2,6 @@
 
 module Gitlab
   class TreeSummary
-    prepend_if_ee('::EE::Gitlab::TreeSummary') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
     include ::Gitlab::Utils::StrongMemoize
 
     CACHE_EXPIRE_IN = 1.hour
@@ -135,3 +133,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::TreeSummary.prepend_if_ee('::EE::Gitlab::TreeSummary')