diff --git a/debian/patches/0440-remove-puma.patch b/debian/patches/0440-remove-puma.patch index 45a5e9ad28..e25d5eef92 100644 --- a/debian/patches/0440-remove-puma.patch +++ b/debian/patches/0440-remove-puma.patch @@ -2,7 +2,14 @@ We are using unicorn so don't need puma --- a/Gemfile +++ b/Gemfile -@@ -167,12 +167,6 @@ +@@ -161,18 +161,13 @@ + + # Application server + gem 'rack', '~> 2.0', '>= 2.0.9' ++gem 'rack-timeout', require: false + + group :unicorn do + gem 'unicorn', '~> 5.5' gem 'unicorn-worker-killer', '~> 0.4.4' end diff --git a/debian/patches/0482-remove-ee-only-gems.patch b/debian/patches/0482-remove-ee-only-gems.patch index 1328c1d222..5ef9d88726 100644 --- a/debian/patches/0482-remove-ee-only-gems.patch +++ b/debian/patches/0482-remove-ee-only-gems.patch @@ -12,7 +12,7 @@ This gem is used only in gitlab Enterprise Edition # Spam and anti-bot protection gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' -@@ -281,8 +278,6 @@ +@@ -282,8 +279,6 @@ gem 'request_store', '~> 1.5' gem 'base32', '~> 0.3.0'