diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 06:07:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 06:07:45 +0300 |
| commit | 9763c081708e4c2e08de1f4e9ca9abdef5cffe3c (patch) | |
| tree | b27794ba1a039cdc42cdf5d90bcb7b7503437324 /config/environments | |
| parent | 7480d774dfca97ea905321d52c70fd19496f0084 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/development.rb | 2 | ||||
| -rw-r--r-- | config/environments/production.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index dc804197fef..2939e13ef94 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -46,7 +46,7 @@ Rails.application.configure do # Do not log asset requests config.assets.quiet = true - config.allow_concurrency = Gitlab::Runtime.multi_threaded? + config.allow_concurrency = defined?(::Puma) # BetterErrors live shell (REPL) on every stack frame BetterErrors::Middleware.allow_ip!("127.0.0.1/0") diff --git a/config/environments/production.rb b/config/environments/production.rb index 7ec18547b2f..09bcf49a9a5 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -75,5 +75,5 @@ Rails.application.configure do config.eager_load = true - config.allow_concurrency = Gitlab::Runtime.multi_threaded? + config.allow_concurrency = defined?(::Puma) end |