diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-10 18:09:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-10 18:09:15 +0000 |
| commit | f6905d2ed293ccde386ba2798e7a623c228e8f51 (patch) | |
| tree | 83e7defc9e9ec94462c3bc3d86e4ca0cbc4b7c21 /config/environments | |
| parent | f2f748c08166ef350aa4183242c3611f6617f651 (diff) | |
| download | gitlab-ce-f6905d2ed293ccde386ba2798e7a623c228e8f51.tar.gz | |
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, 4 insertions, 0 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 9d4fc6ba5e9..25d57467060 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -49,6 +49,8 @@ Rails.application.configure do # Do not log asset requests config.assets.quiet = true + config.allow_concurrency = Gitlab::Runtime.multi_threaded? + # 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 393a274606e..c03421040a3 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -77,4 +77,6 @@ Rails.application.configure do config.action_mailer.raise_delivery_errors = true config.eager_load = true + + config.allow_concurrency = Gitlab::Runtime.multi_threaded? end |