Commit 709011d7 authored by Rajendra Kadam's avatar Rajendra Kadam Committed by Peter Leitzen

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

parent 0a49a02f
---
title: Move prepend to last line in lib/gitlab files
merge_request: 30291
author: Rajendra Kadam
type: fixed
...@@ -18,8 +18,6 @@ module Gitlab ...@@ -18,8 +18,6 @@ module Gitlab
end end
module AuthFinders module AuthFinders
prepend_if_ee('::EE::Gitlab::Auth::AuthFinders') # rubocop: disable Cop/InjectEnterpriseEditionModule
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
include ActionController::HttpAuthentication::Basic include ActionController::HttpAuthentication::Basic
...@@ -249,3 +247,5 @@ module Gitlab ...@@ -249,3 +247,5 @@ module Gitlab
end end
end end
end end
Gitlab::Auth::AuthFinders.prepend_if_ee('::EE::Gitlab::Auth::AuthFinders')
...@@ -8,8 +8,6 @@ module Gitlab ...@@ -8,8 +8,6 @@ module Gitlab
module Auth module Auth
module Ldap module Ldap
class Access class Access
prepend_if_ee('::EE::Gitlab::Auth::Ldap::Access') # rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader :provider, :user, :ldap_identity attr_reader :provider, :user, :ldap_identity
def self.open(user, &block) def self.open(user, &block)
...@@ -118,3 +116,5 @@ module Gitlab ...@@ -118,3 +116,5 @@ module Gitlab
end end
end end
end end
Gitlab::Auth::Ldap::Access.prepend_if_ee('::EE::Gitlab::Auth::Ldap::Access')
...@@ -4,8 +4,6 @@ module Gitlab ...@@ -4,8 +4,6 @@ module Gitlab
module Auth module Auth
module Ldap module Ldap
class Adapter class Adapter
prepend_if_ee('::EE::Gitlab::Auth::Ldap::Adapter') # rubocop: disable Cop/InjectEnterpriseEditionModule
SEARCH_RETRY_FACTOR = [1, 1, 2, 3].freeze SEARCH_RETRY_FACTOR = [1, 1, 2, 3].freeze
MAX_SEARCH_RETRIES = Rails.env.test? ? 1 : SEARCH_RETRY_FACTOR.size.freeze MAX_SEARCH_RETRIES = Rails.env.test? ? 1 : SEARCH_RETRY_FACTOR.size.freeze
...@@ -142,3 +140,5 @@ module Gitlab ...@@ -142,3 +140,5 @@ module Gitlab
end end
end end
end end
Gitlab::Auth::Ldap::Adapter.prepend_if_ee('::EE::Gitlab::Auth::Ldap::Adapter')
...@@ -5,8 +5,6 @@ module Gitlab ...@@ -5,8 +5,6 @@ module Gitlab
module Auth module Auth
module Ldap module Ldap
class Config class Config
prepend_if_ee('::EE::Gitlab::Auth::Ldap::Config') # rubocop: disable Cop/InjectEnterpriseEditionModule
NET_LDAP_ENCRYPTION_METHOD = { NET_LDAP_ENCRYPTION_METHOD = {
simple_tls: :simple_tls, simple_tls: :simple_tls,
start_tls: :start_tls, start_tls: :start_tls,
...@@ -288,3 +286,5 @@ module Gitlab ...@@ -288,3 +286,5 @@ module Gitlab
end end
end end
end end
Gitlab::Auth::Ldap::Config.prepend_if_ee('::EE::Gitlab::Auth::Ldap::Config')
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