Merge branch 'lib-gitlab-refactoring-2' into 'master'

Move prepend to the last line in lib/gitlab - 2

See merge request gitlab-org/gitlab!30070

changelogs/unreleased/lib-gitlab-refactoring-2.yml

+---
+title: Move prepend to last line in lib/gitlab files
+merge_request: 30070
+author: Rajendra Kadam
+type: fixed

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')

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')

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')

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')

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')

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')