summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJan-Willem van der Meer <mail@jewilmeer.nl>2014-10-14 13:11:53 +0200
committerJan-Willem van der Meer <mail@jewilmeer.nl>2014-10-14 13:13:59 +0200
commit6ce65a3e950532e8fb65cf188eb5df9a6eddfb39 (patch)
treeace2949d72914b88506691910b940588db0f2e81 /lib
parent9bf7bfda20a466b375a459b95068de8c0139fc9a (diff)
downloadgitlab-ce-6ce65a3e950532e8fb65cf188eb5df9a6eddfb39.tar.gz
Use Hash syntax for LDAP server declaration
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ldap/config.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb
index 697b66dcdaa..d41bfba9b0f 100644
--- a/lib/gitlab/ldap/config.rb
+++ b/lib/gitlab/ldap/config.rb
@@ -9,11 +9,11 @@ module Gitlab
end
def self.servers
- Gitlab.config.ldap.servers
+ Gitlab.config.ldap.servers.values
end
def self.providers
- servers.map &:provider_name
+ servers.map {|server| server['provider_name'] }
end
def initialize(provider)
@@ -75,7 +75,7 @@ module Gitlab
end
def config_for(provider)
- base_config.servers.find { |server| server.provider_name == provider }
+ base_config.servers.values.find { |server| server['provider_name'] == provider }
end
def encryption