diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 15:09:39 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 15:09:39 +0000 |
| commit | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (patch) | |
| tree | 70945aa6721a271fc8057efa13c3216a03fbac45 /config/initializers | |
| parent | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (diff) | |
| download | gitlab-ce-dc889678d1de8c09310b2f8f9742bb6c78a6f1a4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/8_devise.rb | 6 | ||||
| -rw-r--r-- | config/initializers/omniauth.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config/initializers/8_devise.rb b/config/initializers/8_devise.rb index 6ed56598e15..3daddb10b29 100644 --- a/config/initializers/8_devise.rb +++ b/config/initializers/8_devise.rb @@ -226,9 +226,9 @@ Devise.setup do |config| manager.failure_app = Gitlab::DeviseFailure end - if Gitlab::Auth::LDAP::Config.enabled? - Gitlab::Auth::LDAP::Config.providers.each do |provider| - ldap_config = Gitlab::Auth::LDAP::Config.new(provider) + if Gitlab::Auth::Ldap::Config.enabled? + Gitlab::Auth::Ldap::Config.providers.each do |provider| + ldap_config = Gitlab::Auth::Ldap::Config.new(provider) config.omniauth(provider, ldap_config.omniauth_options) end end diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 0e4cb88b50f..a2720ab9986 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -1,6 +1,6 @@ -if Gitlab::Auth::LDAP::Config.enabled? +if Gitlab::Auth::Ldap::Config.enabled? module OmniAuth::Strategies - Gitlab::Auth::LDAP::Config.available_servers.each do |server| + Gitlab::Auth::Ldap::Config.available_servers.each do |server| # do not redeclare LDAP next if server['provider_name'] == 'ldap' |