diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-10-25 22:29:00 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-10-25 22:29:00 +0000 |
| commit | 679c0048a8f679aad456c02e30486150bbd0d93d (patch) | |
| tree | 7b8dc8313f5454bdc807dfe1201790b8318d47ef /Gemfile.lock | |
| parent | 08d946e209c246ea9c8a8996c9629ad166e68c8b (diff) | |
| parent | 1065f8ce7a261dff5a3077be46405343141733df (diff) | |
| download | gitlab-ce-679c0048a8f679aad456c02e30486150bbd0d93d.tar.gz | |
Merge branch 'an-multithreading' into 'master'
Puma in GDK and rack server lifecycle event abstractions
Closes #52762
See merge request gitlab-org/gitlab-ce!22372
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 240fcd4e551..e533b564d15 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -598,6 +598,10 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) public_suffix (3.0.3) + puma (3.12.0) + puma_worker_killer (0.1.0) + get_process_mem (~> 0.2) + puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) rack (1.6.10) rack-accept (0.4.5) @@ -1076,6 +1080,8 @@ DEPENDENCIES prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) + puma (~> 3.12) + puma_worker_killer rack-attack (~> 4.4.1) rack-cors (~> 1.0.0) rack-oauth2 (~> 1.2.1) |