diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-05-01 16:21:47 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-05-01 16:21:47 +0000 |
commit | f9e2b4730f58ba630344c9554eb907ab003abbd5 (patch) | |
tree | 8ea283d80956ce9117f40cd58469e7dc26a4bb44 /app/controllers/omniauth_callbacks_controller.rb | |
parent | b49ac65e3fcfcac87157810b08d20efd8b8e5e73 (diff) | |
parent | 5b92d405fd6e52e6bf1ab1d440ece5a5c1654198 (diff) | |
download | gitlab-ce-f9e2b4730f58ba630344c9554eb907ab003abbd5.tar.gz |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/projects/branches/_branch.html.haml
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 |