From 2305c4714ccfa8d81a67dc376b0d0c2c1c600b86 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Wed, 24 Jun 2020 00:07:00 +0530
Subject: [PATCH] Relax dependency on faraday gem

---
 debian/patches/0483-relax-faraday.patch | 31 +++++++++++++++++++++++++
 debian/patches/0760-update-grape.patch  |  2 +-
 debian/patches/series                   |  1 +
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/0483-relax-faraday.patch

diff --git a/debian/patches/0483-relax-faraday.patch b/debian/patches/0483-relax-faraday.patch
new file mode 100644
index 0000000000..df426a992f
--- /dev/null
+++ b/debian/patches/0483-relax-faraday.patch
@@ -0,0 +1,31 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -21,7 +21,7 @@
+ gem 'rugged', '~> 0.28'
+ gem 'grape-path-helpers', '~> 1.2'
+ 
+-gem 'faraday', '~> 0.12'
++gem 'faraday', '>= 0.17.3', '< 2'
+ gem 'marginalia', '~> 1.8'
+ 
+ # Authentication libraries
+@@ -283,7 +283,7 @@
+ gem 'rack-attack', '~> 6.3'
+ 
+ # Sentry integration
+-gem 'sentry-raven', '~> 2.9'
++gem 'sentry-raven', '~> 3.0'
+ 
+ gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
+ 
+--- a/faraday-middleware-aws-signers-v4/faraday_middleware-aws-signers-v4.gemspec
++++ b/faraday-middleware-aws-signers-v4/faraday_middleware-aws-signers-v4.gemspec
+@@ -15,7 +15,7 @@
+   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+   spec.require_paths = ['lib']
+ 
+-  spec.add_dependency 'faraday', '~> 0.9'
++  spec.add_dependency 'faraday', '>= 0.17.3', '< 2'
+   spec.add_dependency 'aws-sdk-resources', '>= 2', '< 3'
+ 
+   spec.add_development_dependency 'bundler'
diff --git a/debian/patches/0760-update-grape.patch b/debian/patches/0760-update-grape.patch
index 73c6f99fbf..d0319328b7 100644
--- a/debian/patches/0760-update-grape.patch
+++ b/debian/patches/0760-update-grape.patch
@@ -261,7 +261,7 @@ Closes https://gitlab.com/gitlab-org/gitlab/-/issues/195960
 -gem 'grape-path-helpers', '~> 1.2'
 +gem 'grape-path-helpers', '~> 1.3'
  
- gem 'faraday', '~> 0.12'
+ gem 'faraday', '>= 0.17.3', '< 2'
  gem 'marginalia', '~> 1.8'
 --- a/Gemfile.lock
 +++ b/Gemfile.lock
diff --git a/debian/patches/series b/debian/patches/series
index 3ecc7e166f..02fb4a54bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,7 @@
 0480-embed-elasticsearch-rails.patch
 0480-embed-faraday-middleware-aws-signers-v4.patch
 0482-remove-ee-only-gems.patch
+0483-relax-faraday.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch
 0520-add-system-lib-path-for-webpack.patch