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

Move prepend to the last line in lib gitlab files - 4

See merge request gitlab-org/gitlab!30289

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

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

lib/gitlab/auth/ldap/person.rb

@@ -4,8 +4,6 @@ module Gitlab
   module Auth
     module Ldap
       class Person
-        prepend_if_ee('::EE::Gitlab::Auth::Ldap::Person') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
         # Active Directory-specific LDAP filter that checks if bit 2 of the
         # userAccountControl attribute is set.
         # Source: http://ctogonewild.com/2009/09/03/bitmask-searches-in-ldap/
@@ -122,3 +120,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Auth::Ldap::Person.prepend_if_ee('::EE::Gitlab::Auth::Ldap::Person')

lib/gitlab/auth/ldap/user.rb

@@ -11,8 +11,6 @@ module Gitlab
     module Ldap
       class User < Gitlab::Auth::OAuth::User
         extend ::Gitlab::Utils::Override
-        prepend_if_ee('::EE::Gitlab::Auth::Ldap::User') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
         class << self
           # rubocop: disable CodeReuse/ActiveRecord
           def find_by_uid_and_provider(uid, provider)
@@ -64,3 +62,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Auth::Ldap::User.prepend_if_ee('::EE::Gitlab::Auth::Ldap::User')

lib/gitlab/auth/o_auth/auth_hash.rb

@@ -6,8 +6,6 @@ module Gitlab
   module Auth
     module OAuth
       class AuthHash
-        prepend_if_ee('::EE::Gitlab::Auth::OAuth::AuthHash') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
         attr_reader :auth_hash
         def initialize(auth_hash)
           @auth_hash = auth_hash
@@ -93,3 +91,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Auth::OAuth::AuthHash.prepend_if_ee('::EE::Gitlab::Auth::OAuth::AuthHash')

lib/gitlab/auth/o_auth/user.rb

@@ -9,8 +9,6 @@ module Gitlab
   module Auth
     module OAuth
       class User
-        prepend_if_ee('::EE::Gitlab::Auth::OAuth::User') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
         SignupDisabledError = Class.new(StandardError)
         SigninDisabledForProviderError = Class.new(StandardError)
 
@@ -275,3 +273,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Auth::OAuth::User.prepend_if_ee('::EE::Gitlab::Auth::OAuth::User')

lib/gitlab/auth/result.rb

@@ -3,8 +3,6 @@
 module Gitlab
   module Auth
     Result = Struct.new(:actor, :project, :type, :authentication_abilities) do
-      prepend_if_ee('::EE::Gitlab::Auth::Result') # rubocop: disable Cop/InjectEnterpriseEditionModule
-
       def ci?(for_project)
         type == :ci &&
           project &&
@@ -26,3 +24,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Auth::Result.prepend_if_ee('::EE::Gitlab::Auth::Result')