diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 00:09:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 00:09:34 +0000 |
| commit | 5781a4966047232d4725f9ee4769c4bd5aed9b26 (patch) | |
| tree | 0ef2b81a40931ec51f8fdd5284ed9e47cf42a923 /spec/features/users/login_spec.rb | |
| parent | 4d48b3cfcd74bcca0f0f305746f74cf7224dd78b (diff) | |
| download | gitlab-ce-5781a4966047232d4725f9ee4769c4bd5aed9b26.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/users/login_spec.rb')
| -rw-r--r-- | spec/features/users/login_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/features/users/login_spec.rb b/spec/features/users/login_spec.rb index 0bef61a4854..5a8db3c070d 100644 --- a/spec/features/users/login_spec.rb +++ b/spec/features/users/login_spec.rb @@ -797,6 +797,7 @@ describe 'Login' do before do stub_application_setting(send_user_confirmation_email: true) + stub_feature_flags(soft_email_confirmation: true) allow(User).to receive(:allow_unconfirmed_access_for).and_return grace_period end |