Add latest changes from gitlab-org/security/gitlab@12-10-stable-ee

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')