Relax dependency on faraday gem
This commit is contained in:
parent
7e01fb8c99
commit
2305c4714c
3 changed files with 33 additions and 1 deletions
31
debian/patches/0483-relax-faraday.patch
vendored
Normal file
31
debian/patches/0483-relax-faraday.patch
vendored
Normal file
|
@ -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'
|
2
debian/patches/0760-update-grape.patch
vendored
2
debian/patches/0760-update-grape.patch
vendored
|
@ -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
|
||||
|
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue