diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-07-28 09:13:50 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-07-28 09:13:50 +0000 |
commit | da3100254f446bcb1f27516606f25d92893f81b8 (patch) | |
tree | 1c6346cfd7b0ad057b722b6f694bfd738b5b3fbc /lib | |
parent | 190fae5f0cef11d68c7385be0c4013931796f958 (diff) | |
parent | ef97cb54ae3c62e8bc9062c7f32901520865d754 (diff) | |
download | gitlab-ce-da3100254f446bcb1f27516606f25d92893f81b8.tar.gz |
Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'
Backport some recent changes related to LDAP from EE
See merge request !13119
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ldap/config.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb index 8eda3ea03f9..c8f19cd52d5 100644 --- a/lib/gitlab/ldap/config.rb +++ b/lib/gitlab/ldap/config.rb @@ -18,6 +18,12 @@ module Gitlab Gitlab.config.ldap.servers.values end + def self.available_servers + return [] unless enabled? + + Array.wrap(servers.first) + end + def self.providers servers.map { |server| server['provider_name'] } end |