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

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

See merge request gitlab-org/gitlab!30194

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

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

lib/gitlab/auth/saml/config.rb

@@ -4,8 +4,6 @@ module Gitlab
   module Auth
     module Saml
       class Config
-        prepend_if_ee('::EE::Gitlab::Auth::Saml::Config') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
         class << self
           def options
             Gitlab::Auth::OAuth::Provider.config_for('saml')
@@ -31,3 +29,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Auth::Saml::Config.prepend_if_ee('::EE::Gitlab::Auth::Saml::Config')

lib/gitlab/auth/saml/user.rb

@@ -9,8 +9,6 @@ module Gitlab
   module Auth
     module Saml
       class User < Gitlab::Auth::OAuth::User
-        prepend_if_ee('::EE::Gitlab::Auth::Saml::User') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
         extend ::Gitlab::Utils::Override
 
         def save
@@ -63,3 +61,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Auth::Saml::User.prepend_if_ee('::EE::Gitlab::Auth::Saml::User')

lib/gitlab/checks/base_checker.rb

@@ -3,7 +3,6 @@
 module Gitlab
   module Checks
     class BaseChecker
-      prepend_if_ee('EE::Gitlab::Checks::BaseChecker') # rubocop: disable Cop/InjectEnterpriseEditionModule
       include Gitlab::Utils::StrongMemoize
 
       attr_reader :change_access
@@ -57,3 +56,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Checks::BaseChecker.prepend_if_ee('EE::Gitlab::Checks::BaseChecker')

lib/gitlab/checks/change_access.rb

@@ -3,8 +3,6 @@
 module Gitlab
   module Checks
     class ChangeAccess
-      prepend_if_ee('EE::Gitlab::Checks::ChangeAccess') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
       ATTRIBUTES = %i[user_access project skip_authorization
                       skip_lfs_integrity_check protocol oldrev newrev ref
                       branch_name tag_name logger commits].freeze
@@ -55,3 +53,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Checks::ChangeAccess.prepend_if_ee('EE::Gitlab::Checks::ChangeAccess')

lib/gitlab/checks/diff_check.rb

@@ -4,7 +4,6 @@ module Gitlab
   module Checks
     class DiffCheck < BaseChecker
       include Gitlab::Utils::StrongMemoize
-      prepend_if_ee('EE::Gitlab::Checks::DiffCheck') # rubocop: disable Cop/InjectEnterpriseEditionModule
 
       LOG_MESSAGES = {
         validate_file_paths: "Validating diffs' file paths...",
@@ -97,3 +96,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Checks::DiffCheck.prepend_if_ee('EE::Gitlab::Checks::DiffCheck')

lib/gitlab/ci/parsers.rb

@@ -3,8 +3,6 @@
 module Gitlab
   module Ci
     module Parsers
-      prepend_if_ee('::EE::Gitlab::Ci::Parsers') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
       ParserNotFoundError = Class.new(ParserError)
 
       def self.parsers
@@ -23,3 +21,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Ci::Parsers.prepend_if_ee('::EE::Gitlab::Ci::Parsers')