summaryrefslogtreecommitdiff
path: root/config/environments
diff options
context:
space:
mode:
authorAndrew Newdigate <andrew@gitlab.com>2018-11-05 17:46:15 +0000
committerStan Hu <stanhu@gmail.com>2018-11-05 17:46:15 +0000
commitb6cde1856ff036732fd1d655c3a6fa113c2457a4 (patch)
tree2e5a951f4107e4d4d12b19e55745589629624c5e /config/environments
parent001cb5aae30264104c0e647923430358c00a249f (diff)
downloadgitlab-ce-b6cde1856ff036732fd1d655c3a6fa113c2457a4.tar.gz
Allow concurrency when using Puma
Diffstat (limited to 'config/environments')
-rw-r--r--config/environments/development.rb2
-rw-r--r--config/environments/production.rb2
2 files changed, 3 insertions, 1 deletions
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