diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:39 +0300 |
| commit | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (patch) | |
| tree | 70945aa6721a271fc8057efa13c3216a03fbac45 /app/controllers/sessions_controller.rb | |
| parent | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/sessions_controller.rb')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 01c23ce9db7..2d1c1eeeea0 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -273,8 +273,8 @@ class SessionsController < Devise::SessionsController def ldap_servers @ldap_servers ||= begin - if Gitlab::Auth::LDAP::Config.sign_in_enabled? - Gitlab::Auth::LDAP::Config.available_servers + if Gitlab::Auth::Ldap::Config.sign_in_enabled? + Gitlab::Auth::Ldap::Config.available_servers else [] end |