From 1f7ef2254e49f54d050deed828735fcffea922e1 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Tue, 17 Mar 2015 16:31:44 +0200
Subject: [PATCH] More robust init settings

---
 config/initializers/initial_settings.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/initializers/initial_settings.rb b/config/initializers/initial_settings.rb
index de7abdf73..08b4b5094 100644
--- a/config/initializers/initial_settings.rb
+++ b/config/initializers/initial_settings.rb
@@ -1,5 +1,6 @@
 # otherwise rake not working 100%
-if ActiveRecord::Base.connected? && ActiveRecord::Base.connection.table_exists?('settings')
+con = ActiveRecord::Base.connection
+if con.present? && con.table_exists?('settings')
   Setting.disclosure_name = true if Setting.disclosure_name.nil?
   Setting.disclosure_name = true if Setting.disclosure_name.nil?
   Setting.disclosure_org_name = true if Setting.disclosure_org_name.nil?