From df2eda3f14dccb703bd7054d4ddde7803cb1fe7e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 20 Feb 2020 18:08:51 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/active_record_lifecycle.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config/initializers') diff --git a/config/initializers/active_record_lifecycle.rb b/config/initializers/active_record_lifecycle.rb index 2cf0f0439a9..493d328b93e 100644 --- a/config/initializers/active_record_lifecycle.rb +++ b/config/initializers/active_record_lifecycle.rb @@ -14,6 +14,8 @@ end if defined?(ActiveRecord::Base) Gitlab::Cluster::LifecycleEvents.on_before_fork do + raise 'ActiveRecord connection not established. Unable to start.' unless Gitlab::Database.exists? + # the following is highly recommended for Rails + "preload_app true" # as there's no need for the master process to hold a connection ActiveRecord::Base.connection.disconnect! -- cgit v1.2.3