Commit db7c6d11 authored by GitLab Bot's avatar GitLab Bot

Add latest changes from gitlab-org/security/gitlab@13-0-stable-ee

parent 1e61fc76
...@@ -944,7 +944,7 @@ describe User do ...@@ -944,7 +944,7 @@ describe User do
end end
context 'when the first email was unconfirmed and the second email gets confirmed' do context 'when the first email was unconfirmed and the second email gets confirmed' do
let_it_be(:user) { create(:user, :unconfirmed, email: 'should-be-unconfirmed@test.com') } let(:user) { create(:user, :unconfirmed, email: 'should-be-unconfirmed@test.com') }
before do before do
user.update!(email: 'should-be-confirmed@test.com') user.update!(email: 'should-be-confirmed@test.com')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment