diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2018-10-20 19:00:19 +0100 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2018-10-25 17:50:15 +0100 |
| commit | 1065f8ce7a261dff5a3077be46405343141733df (patch) | |
| tree | 92669873cb55a448de6a581a86d970148762d210 /Gemfile.lock | |
| parent | 605e952e39ddad4efa786ebc06a3175727563db5 (diff) | |
| download | gitlab-ce-1065f8ce7a261dff5a3077be46405343141733df.tar.gz | |
Add experimental support for Pumaan-multithreading
This allows us (and others) to test drive Puma without it affecting all
users. Puma can be enabled by setting the environment variable
"EXPERIMENTAL_PUMA" to a non empty value.
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 bf16bef4f32..da74cae3f5f 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) |