Relax dependency on rails and tighten dpendency on bootsnap

This commit is contained in:
Pirate Praveen 2020-03-13 17:19:44 +05:30
parent 4c6fe1f7e8
commit b3269fd1f3
4 changed files with 10 additions and 14 deletions

4
debian/control vendored
View file

@ -36,8 +36,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
bzip2, bzip2,
ucf, ucf,
gitlab-workhorse (>= 8.18~), gitlab-workhorse (>= 8.18~),
ruby-rails (>= 2:5.2.3~), ruby-rails (>= 2:6.0.2~),
ruby-bootsnap, ruby-bootsnap (>= 1.4~),
ruby-nakayoshi-fork (>= 0.0.4~), ruby-nakayoshi-fork (>= 0.0.4~),
ruby-responders (>= 2.0~), ruby-responders (>= 2.0~),
ruby-sprockets (>= 3.7~), ruby-sprockets (>= 3.7~),

View file

@ -3,6 +3,14 @@ gitlab Gemfile
--- a/Gemfile --- a/Gemfile
+++ b/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 @@ @@ -10,10 +10,10 @@
# Responders respond_to and respond_with # Responders respond_to and respond_with
gem 'responders', '~> 3.0' gem 'responders', '~> 3.0'

View file

@ -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'

View file

@ -6,7 +6,6 @@
0430-remove-gitlab-markup.patch 0430-remove-gitlab-markup.patch
0440-remove-puma.patch 0440-remove-puma.patch
0460-embed-derailed-benchmarks.patch 0460-embed-derailed-benchmarks.patch
0470-relax-bootsnap.patch
0480-embed-elasticsearch-model.patch 0480-embed-elasticsearch-model.patch
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