diff options
| author | Mark Fletcher <markglenfletcher@googlemail.com> | 2018-02-19 15:36:21 +0300 |
|---|---|---|
| committer | Mark Fletcher <markglenfletcher@googlemail.com> | 2018-02-19 15:36:21 +0300 |
| commit | 76f3921140e10e195db8271217b675402b679609 (patch) | |
| tree | 512eb9fbd83d04c406861134c8eb99afc875fc58 /lib/gitlab/ldap/config.rb | |
| parent | dcd1a43faf9654bf6e36d47d88dc914a100c4e33 (diff) | |
| parent | 27a6d876cb690526713baea49ceea2d6dde75417 (diff) | |
Merge branch '10-5-stable-prepare-rc9' into '10-5-stable'
Prepare 10.5 RC9 release
See merge request gitlab-org/gitlab-ce!17210
Diffstat (limited to 'lib/gitlab/ldap/config.rb')
| -rw-r--r-- | lib/gitlab/ldap/config.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb index 47b3fce3e7a..a6bea98d631 100644 --- a/lib/gitlab/ldap/config.rb +++ b/lib/gitlab/ldap/config.rb @@ -15,7 +15,7 @@ module Gitlab end def self.servers - Gitlab.config.ldap.servers.values + Gitlab.config.ldap['servers']&.values || [] end def self.available_servers |