diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 15:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 15:08:47 +0300 |
| commit | 5460c19548d3d3d2ff764ceff05c2b72aa2d3a32 (patch) | |
| tree | 3a7fff116a7f6ff9c033e7f5e87a4341de801784 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | 2fe341d705700b3e99f82076b09b95885878ac0d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 2708e6669e7..c9791703413 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -11,6 +11,8 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController protect_from_forgery except: [:kerberos, :saml, :cas3, :failure], with: :exception, prepend: true + feature_category :authentication_and_authorization + def handle_omniauth omniauth_flow(Gitlab::Auth::OAuth) end |