diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-04-23 00:15:48 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-04-30 17:32:23 +0100 |
| commit | c741f95a3b599971aaf3dfc1ff3ca43a8ba938b8 (patch) | |
| tree | 753c43562b26bd99f6f4d37de75fa3e40cb9f838 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | b51f6e2c214df34a94b9097355775f29b269524b (diff) | |
| download | gitlab-ce-c741f95a3b599971aaf3dfc1ff3ca43a8ba938b8.tar.gz | |
Exclude LDAP from OmniauthCallbackController base methods
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 9137bc92810..40d9fa18a10 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -8,8 +8,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController omniauth_flow(Gitlab::Auth::OAuth) end - Gitlab.config.omniauth.providers.each do |provider| - alias_method provider['name'], :handle_omniauth + AuthHelper.providers_for_base_controller.each do |provider| + alias_method provider, :handle_omniauth end # Extend the standard implementation to also increment |