Automatic merge of gitlab-org/gitlab-ce master

Gemfile

@@ -49,7 +49,7 @@ gem 'jwt', '~> 2.1.0'
 gem 'gssapi', group: :kerberos
 
 # Spam and anti-bot protection
-gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
+gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
 gem 'akismet', '~> 2.0'
 
 # Two-factor authentication

Gemfile.lock

@@ -709,7 +709,7 @@ GEM
       optimist (>= 3.0.0)
     rdoc (6.0.4)
     re2 (1.1.1)
-    recaptcha (3.0.0)
+    recaptcha (4.13.1)
       json
     recursive-open-struct (1.1.0)
     redis (3.3.5)
@@ -1152,7 +1152,7 @@ DEPENDENCIES
   rbtrace (~> 0.4)
   rdoc (~> 6.0)
   re2 (~> 1.1.1)
-  recaptcha (~> 3.0)
+  recaptcha (~> 4.11)
   redis (~> 3.2)
   redis-namespace (~> 1.6.0)
   redis-rails (~> 5.0.2)

changelogs/unreleased/pravi-gitlab-ce-update-recaptcha.yml

+---
+title: Apply recaptcha API change in 4.0
+merge_request: 25921
+author: Praveen Arimbrathodiyil
+type: other

lib/gitlab/recaptcha.rb

@@ -5,8 +5,8 @@ module Gitlab
     def self.load_configurations!
       if Gitlab::CurrentSettings.recaptcha_enabled
         ::Recaptcha.configure do |config|
-          config.public_key  = Gitlab::CurrentSettings.recaptcha_site_key
-          config.private_key = Gitlab::CurrentSettings.recaptcha_private_key
+          config.site_key = Gitlab::CurrentSettings.recaptcha_site_key
+          config.secret_key = Gitlab::CurrentSettings.recaptcha_private_key
         end
 
         true