Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gitlab
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian Ruby Team
gitlab
Commits
c196da8e
Commit
c196da8e
authored
4 years ago
by
Praveen Arimbrathodiyil
Browse files
Options
Downloads
Patches
Plain Diff
Remove unicorn from Gemfile and choose puma
parent
1602088d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
debian/patches/0440-remove-puma.patch
+0
-16
0 additions, 16 deletions
debian/patches/0440-remove-puma.patch
debian/patches/0440-remove-unicorn.patch
+22
-0
22 additions, 0 deletions
debian/patches/0440-remove-unicorn.patch
debian/patches/series
+1
-1
1 addition, 1 deletion
debian/patches/series
with
23 additions
and
17 deletions
debian/patches/0440-remove-puma.patch
deleted
100644 → 0
+
0
−
16
View file @
1602088d
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'
This diff is collapsed.
Click to expand it.
debian/patches/0440-remove-unicorn.patch
0 → 100644
+
22
−
0
View file @
c196da8e
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
This diff is collapsed.
Click to expand it.
debian/patches/series
+
1
−
1
View file @
c196da8e
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment