diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-07-13 13:39:31 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-07-20 13:54:46 +0300 |
| commit | d0afab482f1157d0b41631cb4dbdfdfeadabb7c8 (patch) | |
| tree | 5ac1f6769b6ee311878d0c7d2960414c26ce7f54 /lib/gitlab/auth | |
| parent | 8895863cf340a8a6c9a708dc864af77fe48beaaa (diff) | |
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 'lib/gitlab/auth')
| -rw-r--r-- | lib/gitlab/auth/o_auth/provider.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth/o_auth/provider.rb b/lib/gitlab/auth/o_auth/provider.rb index 5fb61ffe00d..e73743944a9 100644 --- a/lib/gitlab/auth/o_auth/provider.rb +++ b/lib/gitlab/auth/o_auth/provider.rb @@ -30,7 +30,7 @@ module Gitlab def self.enabled?(name) return true if name == 'database' - providers.include?(name.to_sym) + Gitlab::Auth.omniauth_enabled? && providers.include?(name.to_sym) end def self.ldap_provider?(name) |