diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2018-11-05 17:46:15 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-11-05 17:46:15 +0000 |
| commit | b6cde1856ff036732fd1d655c3a6fa113c2457a4 (patch) | |
| tree | 2e5a951f4107e4d4d12b19e55745589629624c5e | |
| parent | 001cb5aae30264104c0e647923430358c00a249f (diff) | |
| download | gitlab-ce-b6cde1856ff036732fd1d655c3a6fa113c2457a4.tar.gz | |
Allow concurrency when using Puma
| -rw-r--r-- | changelogs/unreleased/53362-allow-concurrency-in-puma.yml | 5 | ||||
| -rw-r--r-- | config/environments/development.rb | 2 | ||||
| -rw-r--r-- | config/environments/production.rb | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/changelogs/unreleased/53362-allow-concurrency-in-puma.yml b/changelogs/unreleased/53362-allow-concurrency-in-puma.yml new file mode 100644 index 00000000000..5fbda0161c1 --- /dev/null +++ b/changelogs/unreleased/53362-allow-concurrency-in-puma.yml @@ -0,0 +1,5 @@ +--- +title: Allow Rails concurrency when running in Puma +merge_request: 22751 +author: +type: performance diff --git a/config/environments/development.rb b/config/environments/development.rb index 23790b84e3c..494ddd72556 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -45,4 +45,6 @@ Rails.application.configure do # Do not log asset requests config.assets.quiet = true + + config.allow_concurrency = defined?(::Puma) end diff --git a/config/environments/production.rb b/config/environments/production.rb index 9941987929c..71195164e7a 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -83,5 +83,5 @@ Rails.application.configure do config.eager_load = true - config.allow_concurrency = false + config.allow_concurrency = defined?(::Puma) end |