summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-27 09:18:55 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-27 09:18:55 +0000
commit7f812a8229fdd32c3047b5a2ee16a0a2729bd788 (patch)
tree8097c37c7e3089c94e7138e38097c43ea59eb742
parent3c7132c1c8a7eef2cfc020b2e79b6edbb8083b16 (diff)
downloadgitlab-ce-7f812a8229fdd32c3047b5a2ee16a0a2729bd788.tar.gz
Add latest changes from gitlab-org/security/gitlab@12-9-stable-ee
-rw-r--r--spec/models/user_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 83901e6d84f..44a6ec476f3 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -881,7 +881,7 @@ describe User, :do_not_mock_admin_mode do
end
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
user.update!(email: 'should-be-confirmed@test.com')