VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-08-01 16:04:19 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2019-12-17 03:07:45 +00:00
parent 7480d774df
commit 9763c08170
48 changed files with 188 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/environments/development.rb
View File

@ -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")

2
config/environments/production.rb
View File

@ -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