diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-03-13 14:53:02 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-03-13 14:53:02 +0000 |
| commit | 8a8cc9194095e4c802989b1b2d4e04e99af18c98 (patch) | |
| tree | d017c1de01fca722fa456d5ffeda9efdc2621865 | |
| parent | 69ed9ae4d4bc0a64713c9a01d6ac27f9fc303101 (diff) | |
| parent | 38586061d84c5763bbf850f67cd717b62d480993 (diff) | |
| download | gitlab-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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/pravi-gitlab-ce-update-recaptcha.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/recaptcha.rb | 4 |
4 files changed, 10 insertions, 5 deletions
@@ -46,7 +46,7 @@ gem 'rack-oauth2', '~> 1.9.3' gem 'jwt', '~> 2.1.0' # 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 diff --git a/Gemfile.lock b/Gemfile.lock index f0f9b523a3b..ec34d3f9d67 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -679,7 +679,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) @@ -1113,7 +1113,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) diff --git a/changelogs/unreleased/pravi-gitlab-ce-update-recaptcha.yml b/changelogs/unreleased/pravi-gitlab-ce-update-recaptcha.yml new file mode 100644 index 00000000000..95379fb2ec1 --- /dev/null +++ b/changelogs/unreleased/pravi-gitlab-ce-update-recaptcha.yml @@ -0,0 +1,5 @@ +--- +title: Apply recaptcha API change in 4.0 +merge_request: 25921 +author: Praveen Arimbrathodiyil +type: other 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 |