diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-07-13 18:39:31 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-07-20 18:54:46 +0800 |
| commit | d0afab482f1157d0b41631cb4dbdfdfeadabb7c8 (patch) | |
| tree | 5ac1f6769b6ee311878d0c7d2960414c26ce7f54 /app/controllers | |
| parent | 8895863cf340a8a6c9a708dc864af77fe48beaaa (diff) | |
| download | gitlab-ce-d0afab482f1157d0b41631cb4dbdfdfeadabb7c8.tar.gz | |
Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabled
We also try to unify the way we setup OmniAuth, and how we check
if it's enabled or not.
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 9dd652206fe..4ca42e2d4a2 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -157,6 +157,8 @@ class SessionsController < Devise::SessionsController end def auto_sign_in_with_provider + return unless Gitlab::Auth.omniauth_enabled? + provider = Gitlab.config.omniauth.auto_sign_in_with_provider return unless provider.present? |