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 /spec | |
| 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 'spec')
| -rw-r--r-- | spec/lib/gitlab/usage_data_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index 20def4fefe2..a19b3c0ba66 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -133,7 +133,7 @@ describe Gitlab::UsageData do expect(subject[:signup_enabled]).to eq(Gitlab::CurrentSettings.allow_signup?) expect(subject[:ldap_enabled]).to eq(Gitlab.config.ldap.enabled) expect(subject[:gravatar_enabled]).to eq(Gitlab::CurrentSettings.gravatar_enabled?) - expect(subject[:omniauth_enabled]).to eq(Gitlab.config.omniauth.enabled) + expect(subject[:omniauth_enabled]).to eq(Gitlab::Auth.omniauth_enabled?) expect(subject[:reply_by_email_enabled]).to eq(Gitlab::IncomingEmail.enabled?) expect(subject[:container_registry_enabled]).to eq(Gitlab.config.registry.enabled) expect(subject[:gitlab_shared_runners_enabled]).to eq(Gitlab.config.gitlab_ci.shared_runners_enabled) |