summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-03-13 14:53:02 +0000
committerRémy Coutable <remy@rymai.me>2019-03-13 14:53:02 +0000
commit8a8cc9194095e4c802989b1b2d4e04e99af18c98 (patch)
treed017c1de01fca722fa456d5ffeda9efdc2621865 /lib
parent69ed9ae4d4bc0a64713c9a01d6ac27f9fc303101 (diff)
parent38586061d84c5763bbf850f67cd717b62d480993 (diff)
downloadgitlab-ce-8a8cc9194095e4c802989b1b2d4e04e99af18c98.tar.gz
Merge branch 'pravi/gitlab-ce-update-recaptcha' into 'master'
Update recaptcha gem from 3.x to 4.11 See merge request gitlab-org/gitlab-ce!25921
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/recaptcha.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/recaptcha.rb b/lib/gitlab/recaptcha.rb
index 6559c3e3c57..772d743c9b0 100644
--- a/lib/gitlab/recaptcha.rb
+++ b/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