Remove unicorn from Gemfile and choose puma
This commit is contained in:
parent
1602088de6
commit
c196da8e5f
3 changed files with 23 additions and 17 deletions
16
debian/patches/0440-remove-puma.patch
vendored
16
debian/patches/0440-remove-puma.patch
vendored
|
@ -1,16 +0,0 @@
|
||||||
We are using unicorn so don't need puma
|
|
||||||
|
|
||||||
--- a/Gemfile
|
|
||||||
+++ b/Gemfile
|
|
||||||
@@ -172,11 +172,6 @@
|
|
||||||
gem 'unicorn-worker-killer', '~> 0.4.4'
|
|
||||||
end
|
|
||||||
|
|
||||||
-group :puma do
|
|
||||||
- gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false
|
|
||||||
- gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
|
|
||||||
-end
|
|
||||||
-
|
|
||||||
# State machine
|
|
||||||
gem 'state_machines-activerecord', '~> 0.6.0'
|
|
||||||
|
|
22
debian/patches/0440-remove-unicorn.patch
vendored
Normal file
22
debian/patches/0440-remove-unicorn.patch
vendored
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
puma is default from gitlab 12.9 and unicorn will be removed from 14.0
|
||||||
|
gitlab-puma changes is included in puma package.
|
||||||
|
|
||||||
|
--- a/Gemfile
|
||||||
|
+++ b/Gemfile
|
||||||
|
@@ -167,14 +167,9 @@
|
||||||
|
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
|
||||||
|
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
|
||||||
|
|
||||||
|
-group :unicorn do
|
||||||
|
- gem 'unicorn', '~> 5.5'
|
||||||
|
- gem 'unicorn-worker-killer', '~> 0.4.4'
|
||||||
|
-end
|
||||||
|
-
|
||||||
|
group :puma do
|
||||||
|
- gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false
|
||||||
|
- gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
|
||||||
|
+ gem 'puma', '~> 4.3.3', require: false
|
||||||
|
+ gem 'puma_worker_killer', '~> 0.1.1', require: false
|
||||||
|
end
|
||||||
|
|
||||||
|
# State machine
|
2
debian/patches/series
vendored
2
debian/patches/series
vendored
|
@ -5,7 +5,7 @@
|
||||||
0350-relax-rdoc.patch
|
0350-relax-rdoc.patch
|
||||||
0350-relax-method-source.patch
|
0350-relax-method-source.patch
|
||||||
0430-remove-gitlab-markup.patch
|
0430-remove-gitlab-markup.patch
|
||||||
0440-remove-puma.patch
|
0440-remove-unicorn.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
|
||||||
|
|
Loading…
Reference in a new issue