diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-10 12:08:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-10 12:08:58 +0000 |
| commit | 0211553b0cd32ddcd49fbe61fdb318984d15af18 (patch) | |
| tree | f95d5876dfee2d1ff158f38a676167501e6519db /config/environments | |
| parent | 23ff717a29540bb1d4b0068f164b5f9df99386bf (diff) | |
| download | gitlab-ce-0211553b0cd32ddcd49fbe61fdb318984d15af18.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, 0 insertions, 4 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 25d57467060..9d4fc6ba5e9 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -49,8 +49,6 @@ 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 c03421040a3..393a274606e 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -77,6 +77,4 @@ Rails.application.configure do config.action_mailer.raise_delivery_errors = true config.eager_load = true - - config.allow_concurrency = Gitlab::Runtime.multi_threaded? end |