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 /lib/tasks | |
| 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 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/info.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake index 6de739e9515..e97d77d20e0 100644 --- a/lib/tasks/gitlab/info.rake +++ b/lib/tasks/gitlab/info.rake @@ -54,8 +54,8 @@ namespace :gitlab do puts "HTTP Clone URL:\t#{http_clone_url}" puts "SSH Clone URL:\t#{ssh_clone_url}" puts "Using LDAP:\t#{Gitlab.config.ldap.enabled ? "yes".color(:green) : "no"}" - puts "Using Omniauth:\t#{Gitlab.config.omniauth.enabled ? "yes".color(:green) : "no"}" - puts "Omniauth Providers: #{omniauth_providers.join(', ')}" if Gitlab.config.omniauth.enabled + puts "Using Omniauth:\t#{Gitlab::Auth.omniauth_enabled? ? "yes".color(:green) : "no"}" + puts "Omniauth Providers: #{omniauth_providers.join(', ')}" if Gitlab::Auth.omniauth_enabled? # check Gitolite version gitlab_shell_version_file = "#{Gitlab.config.gitlab_shell.hooks_path}/../VERSION" |