summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-27 09:18:57 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-27 09:18:57 +0000
commit88aa5019d0761340aa35c782439d60fa8ce5dbef (patch)
tree50195f096f85ed73b3db012dedf4e92eb7d732f0
parent20d423eb1b5e517c8e7eb0c360b0a57abef724e0 (diff)
downloadgitlab-ce-88aa5019d0761340aa35c782439d60fa8ce5dbef.tar.gz
Add latest changes from gitlab-org/security/gitlab@12-10-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 47b2e38650c..94dcf74f504 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -942,7 +942,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')