Commit 65278c75 authored by Rajendra Kadam's avatar Rajendra Kadam Committed by Peter Leitzen

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

parent 0a49a02f
---
title: Move prepend to last line in lib/gitlab files
merge_request: 30289
author: Rajendra Kadam
type: fixed
...@@ -4,8 +4,6 @@ module Gitlab ...@@ -4,8 +4,6 @@ module Gitlab
module Auth module Auth
module Ldap module Ldap
class Person 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 # Active Directory-specific LDAP filter that checks if bit 2 of the
# userAccountControl attribute is set. # userAccountControl attribute is set.
# Source: http://ctogonewild.com/2009/09/03/bitmask-searches-in-ldap/ # Source: http://ctogonewild.com/2009/09/03/bitmask-searches-in-ldap/
...@@ -122,3 +120,5 @@ module Gitlab ...@@ -122,3 +120,5 @@ module Gitlab
end end
end end
end end
Gitlab::Auth::Ldap::Person.prepend_if_ee('::EE::Gitlab::Auth::Ldap::Person')
...@@ -11,8 +11,6 @@ module Gitlab ...@@ -11,8 +11,6 @@ module Gitlab
module Ldap module Ldap
class User < Gitlab::Auth::OAuth::User class User < Gitlab::Auth::OAuth::User
extend ::Gitlab::Utils::Override extend ::Gitlab::Utils::Override
prepend_if_ee('::EE::Gitlab::Auth::Ldap::User') # rubocop: disable Cop/InjectEnterpriseEditionModule
class << self class << self
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def find_by_uid_and_provider(uid, provider) def find_by_uid_and_provider(uid, provider)
...@@ -64,3 +62,5 @@ module Gitlab ...@@ -64,3 +62,5 @@ module Gitlab
end end
end end
end end
Gitlab::Auth::Ldap::User.prepend_if_ee('::EE::Gitlab::Auth::Ldap::User')
...@@ -6,8 +6,6 @@ module Gitlab ...@@ -6,8 +6,6 @@ module Gitlab
module Auth module Auth
module OAuth module OAuth
class AuthHash class AuthHash
prepend_if_ee('::EE::Gitlab::Auth::OAuth::AuthHash') # rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader :auth_hash attr_reader :auth_hash
def initialize(auth_hash) def initialize(auth_hash)
@auth_hash = auth_hash @auth_hash = auth_hash
...@@ -93,3 +91,5 @@ module Gitlab ...@@ -93,3 +91,5 @@ module Gitlab
end end
end end
end end
Gitlab::Auth::OAuth::AuthHash.prepend_if_ee('::EE::Gitlab::Auth::OAuth::AuthHash')
...@@ -9,8 +9,6 @@ module Gitlab ...@@ -9,8 +9,6 @@ module Gitlab
module Auth module Auth
module OAuth module OAuth
class User class User
prepend_if_ee('::EE::Gitlab::Auth::OAuth::User') # rubocop: disable Cop/InjectEnterpriseEditionModule
SignupDisabledError = Class.new(StandardError) SignupDisabledError = Class.new(StandardError)
SigninDisabledForProviderError = Class.new(StandardError) SigninDisabledForProviderError = Class.new(StandardError)
...@@ -275,3 +273,5 @@ module Gitlab ...@@ -275,3 +273,5 @@ module Gitlab
end end
end end
end end
Gitlab::Auth::OAuth::User.prepend_if_ee('::EE::Gitlab::Auth::OAuth::User')
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
module Gitlab module Gitlab
module Auth module Auth
Result = Struct.new(:actor, :project, :type, :authentication_abilities) do Result = Struct.new(:actor, :project, :type, :authentication_abilities) do
prepend_if_ee('::EE::Gitlab::Auth::Result') # rubocop: disable Cop/InjectEnterpriseEditionModule
def ci?(for_project) def ci?(for_project)
type == :ci && type == :ci &&
project && project &&
...@@ -26,3 +24,5 @@ module Gitlab ...@@ -26,3 +24,5 @@ module Gitlab
end end
end end
end end
Gitlab::Auth::Result.prepend_if_ee('::EE::Gitlab::Auth::Result')
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