Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Walker <bwalker@gitlab.com>2018-10-12 22:08:13 +0300
committerBrett Walker <bwalker@gitlab.com>2018-10-12 22:08:13 +0300
commitf48039933435f32a0f7aeb24a491cb5ba12eb516 (patch)
tree92633ec27ed7abe2abce831967a9653659fc1c84 /config/unicorn.rb.example.development
parent1103f589f0a77bf11ca3103165fb287a6d092eb5 (diff)
Fix rubocop complaining about unicorn.rb
Diffstat (limited to 'config/unicorn.rb.example.development')
-rw-r--r--config/unicorn.rb.example.development4
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