summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-30 15:49:23 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-30 15:49:23 +0000
commit8da6d464b6ae9fd1248e18585f7426b6761c2c31 (patch)
treee76d90efc57fd56a596a4e06be8137a2dc7b493b
parente8c894d0365414bab8a322c614690cae7d29949a (diff)
downloadgitlab-ce-8da6d464b6ae9fd1248e18585f7426b6761c2c31.tar.gz
Add latest changes from gitlab-org/security/gitlab@15-7-stable-ee
-rw-r--r--spec/features/users/login_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/features/users/login_spec.rb b/spec/features/users/login_spec.rb
index 105e9f97989..5e683befeec 100644
--- a/spec/features/users/login_spec.rb
+++ b/spec/features/users/login_spec.rb
@@ -926,7 +926,8 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_
stub_omniauth_saml_config(enabled: true, auto_link_saml_user: true, allow_single_sign_on: ['saml'], providers: [mock_saml_config])
end
- it 'asks the user to accept the terms before setting an email' do
+ it 'asks the user to accept the terms before setting an email',
+ quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/388049', type: :flaky } do
expect(authentication_metrics)
.to increment(:user_authenticated_counter)