summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Newdigate <andrew@gitlab.com>2018-11-01 15:48:31 +0000
committerAndrew Newdigate <andrew@gitlab.com>2018-11-01 15:48:31 +0000
commitf0eacfa753b133a4316596e68ab4b87d9134b51e (patch)
tree1f422eba67341f4211f38cab6d828bbd6523abbf
parente62168fcae0089d84ff00c799f98915de5ec1145 (diff)
downloadgitlab-ce-53362-allow-concurrency-in-puma.tar.gz
Allow concurrency when using Puma53362-allow-concurrency-in-puma
-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