diff --git a/debian/changelog b/debian/changelog index bd032418fb..f646bc67de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gitlab (10.7.7+dfsg-2) UNRELEASED; urgency=medium + + * Relax recaptcha version (Closes: #907488) + + -- Lucas Kanashiro Tue, 04 Sep 2018 08:14:13 -0300 + gitlab (10.7.7+dfsg-1) experimental; urgency=medium * New upstream version 10.7.7+dfsg (Fixes: CVE-2018-14364) (Closes: #904026) diff --git a/debian/patches/0025-Relax-recaptcha-version.patch b/debian/patches/0025-Relax-recaptcha-version.patch new file mode 100644 index 0000000000..f65dc43fdd --- /dev/null +++ b/debian/patches/0025-Relax-recaptcha-version.patch @@ -0,0 +1,21 @@ +From: Lucas Kanashiro +Date: Tue, 4 Sep 2018 08:09:21 -0300 +Subject: Relax recaptcha version + +--- + Gemfile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Gemfile b/Gemfile +index 60d2709..0ab5c72 100644 +--- a/Gemfile ++++ b/Gemfile +@@ -56,7 +56,7 @@ gem 'rack-oauth2', '~> 1.2', '>= 1.2.1' + gem 'jwt', '~> 1.5', '>= 1.5.6' + + # 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/debian/patches/series b/debian/patches/series index 4e35a002fd..fba2c877ab 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,3 +22,4 @@ remove-bundle-analyzer.patch fix-mail-room-path.patch relax-ruby-version.pacth fix-8-to-10-migration.patch +0025-Relax-recaptcha-version.patch