Commit 38586061 authored by Toon Claes's avatar Toon Claes

Apply recaptcha API changes in 4.0

In recaptcha 4.0.0 there was an API change:

 - `public_key` -> `site_key`
 - `private_key` -> secret_key

See:
https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md
parent b816236e
...@@ -680,7 +680,7 @@ GEM ...@@ -680,7 +680,7 @@ GEM
optimist (>= 3.0.0) optimist (>= 3.0.0)
rdoc (6.0.4) rdoc (6.0.4)
re2 (1.1.1) re2 (1.1.1)
recaptcha (4.13.0) recaptcha (4.13.1)
json json
recursive-open-struct (1.1.0) recursive-open-struct (1.1.0)
redis (3.3.5) redis (3.3.5)
...@@ -1118,7 +1118,6 @@ DEPENDENCIES ...@@ -1118,7 +1118,6 @@ DEPENDENCIES
rdoc (~> 6.0) rdoc (~> 6.0)
re2 (~> 1.1.1) re2 (~> 1.1.1)
recaptcha (~> 4.11) recaptcha (~> 4.11)
redcarpet (~> 3.4)
redis (~> 3.2) redis (~> 3.2)
redis-namespace (~> 1.6.0) redis-namespace (~> 1.6.0)
redis-rails (~> 5.0.2) redis-rails (~> 5.0.2)
......
This diff is collapsed.
---
title: Apply recaptcha API change in 4.0
merge_request: 25921
author: Praveen Arimbrathodiyil
type: other
...@@ -5,8 +5,8 @@ module Gitlab ...@@ -5,8 +5,8 @@ module Gitlab
def self.load_configurations! def self.load_configurations!
if Gitlab::CurrentSettings.recaptcha_enabled if Gitlab::CurrentSettings.recaptcha_enabled
::Recaptcha.configure do |config| ::Recaptcha.configure do |config|
config.public_key = Gitlab::CurrentSettings.recaptcha_site_key config.site_key = Gitlab::CurrentSettings.recaptcha_site_key
config.private_key = Gitlab::CurrentSettings.recaptcha_private_key config.secret_key = Gitlab::CurrentSettings.recaptcha_private_key
end end
true true
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment