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 /config/initializers/omniauth.rb | |
| 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 'config/initializers/omniauth.rb')
| -rw-r--r-- | config/initializers/omniauth.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index c558eb28ced..ef23ca065c6 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -16,8 +16,3 @@ OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_s OmniAuth.config.before_request_phase do |env| Gitlab::RequestForgeryProtection.call(env) end - -if Gitlab::OmniauthInitializer.enabled? - provider_names = Gitlab.config.omniauth.providers.map(&:name) - Gitlab::Auth.omniauth_setup_providers(provider_names) -end |