diff --git a/debian/control b/debian/control index 7e78ac145d..9e9b875bfc 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-pg (>= 1.1~), ruby-rugged (>= 0.28~), ruby-grape-path-helpers (>= 1.3~), - ruby-faraday (>= 0.14~), + ruby-faraday (>= 0.17.3~), ruby-marginalia (>= 1.8~), # Authentication libraries ruby-devise (>= 4.7.1~), @@ -98,7 +98,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-grape (>= 1.3.3~), # https://gitlab.com/gitlab-org/gitlab/-/issues/219623 ruby-rack-timeout, - ruby-grape-entity (>= 0.7.1~), + ruby-grape-entity (>= 0.8~), ruby-rack-cors (>= 1.0.6~), # GraphQL API ruby-graphql (>= 1.10.5~), @@ -262,7 +262,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-virtus (>= 1.0.5-3~), ruby-base32 (>= 0.3.0~), # Sentry integration - ruby-sentry-raven (>= 3.0~), + ruby-sentry-raven (>= 2.13~), # ruby-premailer-rails (>= 1.10.3~), # LabKit: Tracing and Correlation diff --git a/debian/patches/0483-relax-faraday.patch b/debian/patches/0483-relax-faraday.patch deleted file mode 100644 index df426a992f..0000000000 --- a/debian/patches/0483-relax-faraday.patch +++ /dev/null @@ -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' diff --git a/debian/patches/0484-relax-grape-entity.patch b/debian/patches/0484-relax-grape-entity.patch new file mode 100644 index 0000000000..5ea3b04451 --- /dev/null +++ b/debian/patches/0484-relax-grape-entity.patch @@ -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 diff --git a/debian/patches/0760-update-grape.patch b/debian/patches/0760-update-grape.patch index d0319328b7..73c6f99fbf 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.17.3', '< 2' + gem 'faraday', '~> 0.12' gem 'marginalia', '~> 1.8' --- a/Gemfile.lock +++ b/Gemfile.lock diff --git a/debian/patches/series b/debian/patches/series index 02fb4a54bf..3d445b75dc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,7 +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 +0484-relax-grape-entity.patch 0500-set-webpack-root.patch 0510-remove-dev-dependencies.patch 0520-add-system-lib-path-for-webpack.patch