Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-12 18:09:39 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-12 18:09:39 +0300
commitdc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (patch)
tree70945aa6721a271fc8057efa13c3216a03fbac45 /config/initializers/8_devise.rb
parentcd52759ee33051b8ad7b88b02ba7954e4fad7018 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/8_devise.rb')
-rw-r--r--config/initializers/8_devise.rb6
1 files changed, 3 insertions, 3 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