Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/ldap/user.rb')
-rw-r--r--lib/gitlab/ldap/user.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
index e568b0e3b31..e5023f5da11 100644
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
@@ -68,12 +68,13 @@ module Gitlab
Gitlab::LDAP::Access.allowed?(gl_user)
end
- def ldap_config
- Gitlab::LDAP::Config.new(auth_hash.provider)
+ def ldap_config(provider = auth_hash.provider)
+ Gitlab::LDAP::Config.new(provider)
end
def auth_hash=(auth_hash)
- @auth_hash = Gitlab::LDAP::AuthHash.new(auth_hash, ldap_config)
+ config = ldap_config(auth_hash.provider)
+ @auth_hash = Gitlab::LDAP::AuthHash.new(auth_hash, config)
end
end
end