Merge branch 'prevent-redirect-loop-when-requiring-credit-card' into 'master'

Do not require a credit card verification on signup when it is already present

See merge request gitlab-org/gitlab!78910

ee/app/controllers/concerns/registrations/verification.rb

@@ -19,6 +19,8 @@ module Registrations::Verification
     end
 
     def set_requires_verification
+      return if current_user.credit_card_validation.present?
+
       ::Users::UpdateService.new(current_user, user: current_user, requires_credit_card_verification: true).execute!
     end
   end

ee/spec/controllers/concerns/registrations/verification_spec.rb

@@ -67,5 +67,15 @@ RSpec.describe Registrations::Verification do
     it 'sets the requires_credit_card_verification attribute' do
       expect { get :new }.to change { user.reload.requires_credit_card_verification }.to(true)
     end
+
+    context 'when a credit card validation exists' do
+      before do
+        create(:credit_card_validation, user: user)
+      end
+
+      it 'does not change the requires_credit_card_verification attribute' do
+        expect { get :new }.not_to change { user.reload.requires_credit_card_verification }
+      end
+    end
   end
 end