Update dependencies on ruby-faraday, ruby-sentry-raven and ruby-grape-entity
This commit is contained in:
parent
9944b2a412
commit
0b481ea17d
5 changed files with 18 additions and 36 deletions
6
debian/control
vendored
6
debian/control
vendored
|
@ -47,7 +47,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
ruby-pg (>= 1.1~),
|
ruby-pg (>= 1.1~),
|
||||||
ruby-rugged (>= 0.28~),
|
ruby-rugged (>= 0.28~),
|
||||||
ruby-grape-path-helpers (>= 1.3~),
|
ruby-grape-path-helpers (>= 1.3~),
|
||||||
ruby-faraday (>= 0.14~),
|
ruby-faraday (>= 0.17.3~),
|
||||||
ruby-marginalia (>= 1.8~),
|
ruby-marginalia (>= 1.8~),
|
||||||
# Authentication libraries
|
# Authentication libraries
|
||||||
ruby-devise (>= 4.7.1~),
|
ruby-devise (>= 4.7.1~),
|
||||||
|
@ -98,7 +98,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
ruby-grape (>= 1.3.3~),
|
ruby-grape (>= 1.3.3~),
|
||||||
# https://gitlab.com/gitlab-org/gitlab/-/issues/219623
|
# https://gitlab.com/gitlab-org/gitlab/-/issues/219623
|
||||||
ruby-rack-timeout,
|
ruby-rack-timeout,
|
||||||
ruby-grape-entity (>= 0.7.1~),
|
ruby-grape-entity (>= 0.8~),
|
||||||
ruby-rack-cors (>= 1.0.6~),
|
ruby-rack-cors (>= 1.0.6~),
|
||||||
# GraphQL API
|
# GraphQL API
|
||||||
ruby-graphql (>= 1.10.5~),
|
ruby-graphql (>= 1.10.5~),
|
||||||
|
@ -262,7 +262,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
ruby-virtus (>= 1.0.5-3~),
|
ruby-virtus (>= 1.0.5-3~),
|
||||||
ruby-base32 (>= 0.3.0~),
|
ruby-base32 (>= 0.3.0~),
|
||||||
# Sentry integration
|
# Sentry integration
|
||||||
ruby-sentry-raven (>= 3.0~),
|
ruby-sentry-raven (>= 2.13~),
|
||||||
#
|
#
|
||||||
ruby-premailer-rails (>= 1.10.3~),
|
ruby-premailer-rails (>= 1.10.3~),
|
||||||
# LabKit: Tracing and Correlation
|
# LabKit: Tracing and Correlation
|
||||||
|
|
31
debian/patches/0483-relax-faraday.patch
vendored
31
debian/patches/0483-relax-faraday.patch
vendored
|
@ -1,31 +0,0 @@
|
||||||
--- 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'
|
|
13
debian/patches/0484-relax-grape-entity.patch
vendored
Normal file
13
debian/patches/0484-relax-grape-entity.patch
vendored
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
Debian already has 0.8
|
||||||
|
|
||||||
|
--- a/Gemfile
|
||||||
|
+++ b/Gemfile
|
||||||
|
@@ -79,7 +79,7 @@
|
||||||
|
|
||||||
|
# API
|
||||||
|
gem 'grape', '~> 1.1'
|
||||||
|
-gem 'grape-entity', '~> 0.7.1'
|
||||||
|
+gem 'grape-entity', '~> 0.8'
|
||||||
|
gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'
|
||||||
|
|
||||||
|
# GraphQL API
|
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.2'
|
||||||
+gem 'grape-path-helpers', '~> 1.3'
|
+gem 'grape-path-helpers', '~> 1.3'
|
||||||
|
|
||||||
gem 'faraday', '>= 0.17.3', '< 2'
|
gem 'faraday', '~> 0.12'
|
||||||
gem 'marginalia', '~> 1.8'
|
gem 'marginalia', '~> 1.8'
|
||||||
--- a/Gemfile.lock
|
--- a/Gemfile.lock
|
||||||
+++ b/Gemfile.lock
|
+++ b/Gemfile.lock
|
||||||
|
|
2
debian/patches/series
vendored
2
debian/patches/series
vendored
|
@ -10,7 +10,7 @@
|
||||||
0480-embed-elasticsearch-rails.patch
|
0480-embed-elasticsearch-rails.patch
|
||||||
0480-embed-faraday-middleware-aws-signers-v4.patch
|
0480-embed-faraday-middleware-aws-signers-v4.patch
|
||||||
0482-remove-ee-only-gems.patch
|
0482-remove-ee-only-gems.patch
|
||||||
0483-relax-faraday.patch
|
0484-relax-grape-entity.patch
|
||||||
0500-set-webpack-root.patch
|
0500-set-webpack-root.patch
|
||||||
0510-remove-dev-dependencies.patch
|
0510-remove-dev-dependencies.patch
|
||||||
0520-add-system-lib-path-for-webpack.patch
|
0520-add-system-lib-path-for-webpack.patch
|
||||||
|
|
Loading…
Reference in a new issue