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:
authorDouwe Maan <douwe@gitlab.com>2015-09-09 13:40:31 +0300
committerDouwe Maan <douwe@gitlab.com>2015-09-09 13:40:31 +0300
commit909a8443c63db423f031b8c7f810c13b3bc20b87 (patch)
tree407a473ad47c92a98f8b21891ad57731ce58f2bc /lib/gitlab/ldap/user.rb
parent9c6ed296640ff06d5ae078024f112e44910af235 (diff)
Shuffle config around a bit
Diffstat (limited to 'lib/gitlab/ldap/user.rb')
-rw-r--r--lib/gitlab/ldap/user.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
index e5023f5da11..cb66fd500fe 100644
--- a/lib/gitlab/ldap/user.rb
+++ b/lib/gitlab/ldap/user.rb
@@ -68,13 +68,12 @@ module Gitlab
Gitlab::LDAP::Access.allowed?(gl_user)
end
- def ldap_config(provider = auth_hash.provider)
- Gitlab::LDAP::Config.new(provider)
+ def ldap_config
+ Gitlab::LDAP::Config.new(auth_hash.provider)
end
def auth_hash=(auth_hash)
- config = ldap_config(auth_hash.provider)
- @auth_hash = Gitlab::LDAP::AuthHash.new(auth_hash, config)
+ @auth_hash = Gitlab::LDAP::AuthHash.new(auth_hash)
end
end
end