From d0afab482f1157d0b41631cb4dbdfdfeadabb7c8 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Fri, 13 Jul 2018 18:39:31 +0800 Subject: 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. --- app/helpers/auth_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers/auth_helper.rb') diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb index d2daee22aba..18f0979fc86 100644 --- a/app/helpers/auth_helper.rb +++ b/app/helpers/auth_helper.rb @@ -7,7 +7,7 @@ module AuthHelper end def omniauth_enabled? - Gitlab.config.omniauth.enabled + Gitlab::Auth.omniauth_enabled? end def provider_has_icon?(name) -- cgit v1.2.1