Merge branch 'bump-recaptcha-gem' into 'master'

Bump recaptcha gem to 3.0.0 to remove deprecated stoken support Google deprecated the use of stoken in its reCAPTCHA, so this gem is necessary to make things work again. Closes #18210 See merge request !4484

Merge branch 'bump-recaptcha-gem' into 'master'
Bump recaptcha gem to 3.0.0 to remove deprecated stoken support Google deprecated the use of stoken in its reCAPTCHA, so this gem is necessary to make things work again. Closes #18210 See merge request !4484
703026c0 · Robert Speicher · fd248392 · 405d752b · 703026c0 · 703026c0
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.9.0 (unreleased)
  - Make EmailsOnPushWorker use Sidekiq mailers queue
  - Fix wiki page events' webhook to point to the wiki repository
  - Fix issue todo not remove when leave project !4150 (Long Nguyen)
+  - Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
  - Allow forking projects with restricted visibility level
  - Improve note validation to prevent errors when creating invalid note via API
  - Reduce number of fog gem dependencies

--- a/Gemfile
+++ b/Gemfile
@@ -38,7 +38,7 @@ gem 'rack-oauth2',            '~> 1.2.1'
 gem 'jwt'

 # Spam and anti-bot protection
-gem 'recaptcha', require: 'recaptcha/rails'
+gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
 gem 'akismet', '~> 2.0'

 # Two-factor authentication

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -551,7 +551,7 @@ GEM
      debugger-ruby_core_source (~> 1.3)
    rdoc (3.12.2)
      json (~> 1.4)
-    recaptcha (1.0.2)
+    recaptcha (3.0.0)
      json
    redcarpet (3.3.3)
    redis (3.3.0)
@@ -934,7 +934,7 @@ DEPENDENCIES
  raphael-rails (~> 2.1.2)
  rblineprof
  rdoc (~> 3.6)
-  recaptcha
+  recaptcha (~> 3.0)
  redcarpet (~> 3.3.3)
  redis (~> 3.2)
  redis-namespace