Skip to content
Snippets Groups Projects
Commit c196da8e authored by Praveen Arimbrathodiyil's avatar Praveen Arimbrathodiyil
Browse files

Remove unicorn from Gemfile and choose puma

parent 1602088d
No related branches found
No related tags found
Loading
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'
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
......@@ -5,7 +5,7 @@
0350-relax-rdoc.patch
0350-relax-method-source.patch
0430-remove-gitlab-markup.patch
0440-remove-puma.patch
0440-remove-unicorn.patch
0480-embed-elasticsearch-model.patch
0480-embed-elasticsearch-rails.patch
0480-embed-faraday-middleware-aws-signers-v4.patch
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment