diff --git a/debian/control b/debian/control index 18d4adb831..394cac97ec 100644 --- a/debian/control +++ b/debian/control @@ -36,8 +36,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, bzip2, ucf, gitlab-workhorse (>= 8.18~), - ruby-rails (>= 2:5.2.3~), - ruby-bootsnap, + ruby-rails (>= 2:6.0.2~), + ruby-bootsnap (>= 1.4~), ruby-nakayoshi-fork (>= 0.0.4~), ruby-responders (>= 2.0~), ruby-sprockets (>= 3.7~), diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch index 091e688bf0..81eeda6459 100644 --- a/debian/patches/0050-relax-stable-libs.patch +++ b/debian/patches/0050-relax-stable-libs.patch @@ -3,6 +3,14 @@ gitlab Gemfile --- a/Gemfile +++ b/Gemfile +@@ -1,6 +1,6 @@ + source 'https://rubygems.org' + +-gem 'rails', '6.0.2' ++gem 'rails', '~> 6.0.2' + + gem 'bootsnap', '~> 1.4' + @@ -10,10 +10,10 @@ # Responders respond_to and respond_with gem 'responders', '~> 3.0' diff --git a/debian/patches/0470-relax-bootsnap.patch b/debian/patches/0470-relax-bootsnap.patch deleted file mode 100644 index e10da92f9c..0000000000 --- a/debian/patches/0470-relax-bootsnap.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Gemfile -+++ b/Gemfile -@@ -2,7 +2,7 @@ - - gem 'rails', '6.0.2' - --gem 'bootsnap', '~> 1.4' -+gem 'bootsnap', '~> 1.3' - - # Improves copy-on-write performance for MRI - gem 'nakayoshi_fork', '~> 0.0.4' diff --git a/debian/patches/series b/debian/patches/series index 4d9f0f9b77..ee6c00c4ee 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,7 +6,6 @@ 0430-remove-gitlab-markup.patch 0440-remove-puma.patch 0460-embed-derailed-benchmarks.patch -0470-relax-bootsnap.patch 0480-embed-elasticsearch-model.patch 0480-embed-elasticsearch-rails.patch 0480-embed-faraday-middleware-aws-signers-v4.patch