diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-15 15:08:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-15 15:08:04 +0000 |
| commit | c4c1fc5fe7c756fc6f8f79eb1624b1bbe4fe2d69 (patch) | |
| tree | 8c95e39fc4956cdd9178c46ea85cbeeeac3bc360 /spec/controllers/ldap | |
| parent | 927df95cc4453bdacbc59960df32008b02c4e28a (diff) | |
| download | gitlab-ce-c4c1fc5fe7c756fc6f8f79eb1624b1bbe4fe2d69.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/ldap')
| -rw-r--r-- | spec/controllers/ldap/omniauth_callbacks_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb b/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb index 2e7d3746031..0242a91ac60 100644 --- a/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb +++ b/spec/controllers/ldap/omniauth_callbacks_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Ldap::OmniauthCallbacksController, :do_not_mock_admin_mode do +describe Ldap::OmniauthCallbacksController do include_context 'Ldap::OmniauthCallbacksController' it 'allows sign in' do |