diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-28 06:06:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-28 06:06:25 +0000 |
| commit | 45a05a8ba33101ffcd154ee84307885b48b17962 (patch) | |
| tree | 037cf2ef8575f6f4900f6ec009ca2ac46a539192 /Gemfile | |
| parent | 284ae7dd7536df63fc6dd971f65ca420e26d2f05 (diff) | |
| download | gitlab-ce-45a05a8ba33101ffcd154ee84307885b48b17962.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -170,8 +170,8 @@ group :unicorn do end group :puma do - gem 'puma', '~> 3.12', require: false - gem 'puma_worker_killer', require: false + gem 'puma', '~> 4.3.0', require: false + gem 'puma_worker_killer', '~> 0.1.1', require: false gem 'rack-timeout', require: false end |