diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-07-23 07:48:00 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-23 07:48:00 +0000 |
| commit | 8bc7845fbf424b9f451247459dcb3a8bbe953242 (patch) | |
| tree | c379386a488bbbf34244880624742fc09c2baea9 /lib/tasks | |
| parent | 10698db7aa0979a5c6e7cadc5eadc69b8c86f58c (diff) | |
| parent | d0afab482f1157d0b41631cb4dbdfdfeadabb7c8 (diff) | |
| download | gitlab-ce-8bc7845fbf424b9f451247459dcb3a8bbe953242.tar.gz | |
Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'
Resolve "Disable SAML and Bitbucket if OmniAuth is disabled"
Closes #48932
See merge request gitlab-org/gitlab-ce!20608
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" |