Merge branch '12-1-stable-patch-10' into '12-1-stable'

Prepare 12.1.10 release

See merge request gitlab-org/gitlab-foss!32979

2 files changed, 4 insertions, 7 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 482215e841f..609c9d0821d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -9,6 +9,7 @@ class Project < ApplicationRecord
   include AccessRequestable
   include Avatarable
   include CacheMarkdownField
+  include IgnorableColumn
   include Referable
   include Sortable
   include AfterCommitQueue
@@ -55,6 +56,8 @@ class Project < ApplicationRecord
   VALID_MIRROR_PORTS = [22, 80, 443].freeze
   VALID_MIRROR_PROTOCOLS = %w(http https ssh git).freeze
 
+  ignore_column :import_status, :import_jid, :import_error
+
   cache_markdown_field :description, pipeline: :description
 
   delegate :feature_available?, :builds_enabled?, :wiki_enabled?,
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index faf3c990cb2..fc990a6b295 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -47,17 +47,12 @@ describe RegistrationsController do
     end
 
     context 'when reCAPTCHA is enabled' do
-      def fail_recaptcha
-        # Without this, `verify_recaptcha` arbitrarily returns true in test env
-        Recaptcha.configuration.skip_verify_env.delete('test')
-      end
-
       before do
         stub_application_setting(recaptcha_enabled: true)
       end
 
       it 'displays an error when the reCAPTCHA is not solved' do
-        fail_recaptcha
+        allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false)
 
         post(:create, params: user_params)
 
@@ -78,7 +73,6 @@ describe RegistrationsController do
 
       it 'does not require reCAPTCHA if disabled by feature flag' do
         stub_feature_flags(registrations_recaptcha: false)
-        fail_recaptcha
 
         post(:create, params: user_params)