diff options
| author | jerasmus <jerasmus@gitlab.com> | 2018-10-15 12:42:24 +0200 |
|---|---|---|
| committer | jerasmus <jerasmus@gitlab.com> | 2018-10-15 12:42:24 +0200 |
| commit | 58f29d5f855ea2e1411b99804a74710483a13f90 (patch) | |
| tree | 0b06ecd3c0bb1bcf3d3c6660c2bc49eefaff08b2 /config/unicorn.rb.example.development | |
| parent | 0572da24c990fc01d88acfbd32728221e3e3a711 (diff) | |
| parent | a9827357186e38e5732d8dae23d9d02b1f4c7218 (diff) | |
| download | gitlab-ce-58f29d5f855ea2e1411b99804a74710483a13f90.tar.gz | |
Merge branch 'master' into 48746-fix-files-uploaded-in-base6448746-fix-files-uploaded-in-base64
Diffstat (limited to 'config/unicorn.rb.example.development')
| -rw-r--r-- | config/unicorn.rb.example.development | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/unicorn.rb.example.development b/config/unicorn.rb.example.development index 5712549a66d..f31df66015a 100644 --- a/config/unicorn.rb.example.development +++ b/config/unicorn.rb.example.development @@ -7,7 +7,7 @@ check_client_connection false before_fork do |server, worker| # the following is highly recommended for Rails + "preload_app true" # as there's no need for the master process to hold a connection - defined?(ActiveRecord::Base) and + defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.disconnect! if /darwin/ =~ RUBY_PLATFORM @@ -27,6 +27,6 @@ after_fork do |server, worker| require 'rbtrace' if ENV['ENABLE_RBTRACE'] # the following is *required* for Rails + "preload_app true", - defined?(ActiveRecord::Base) and + defined?(ActiveRecord::Base) && ActiveRecord::Base.establish_connection end |