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 /config/routes | |
| parent | cd52759ee33051b8ad7b88b02ba7954e4fad7018 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/user.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/routes/user.rb b/config/routes/user.rb index fe7a0aa3233..9db3a71a270 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -10,9 +10,9 @@ def override_omniauth(provider, controller, path_prefix = '/users/auth') end # Use custom controller for LDAP omniauth callback -if Gitlab::Auth::LDAP::Config.sign_in_enabled? +if Gitlab::Auth::Ldap::Config.sign_in_enabled? devise_scope :user do - Gitlab::Auth::LDAP::Config.available_servers.each do |server| + Gitlab::Auth::Ldap::Config.available_servers.each do |server| override_omniauth(server['provider_name'], 'ldap/omniauth_callbacks') end end |