summaryrefslogtreecommitdiff
path: root/lib/gitlab/current_settings.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/current_settings.rb')
-rw-r--r--lib/gitlab/current_settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 429f1f9bb56..19b7427256c 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -38,7 +38,7 @@ module Gitlab
true
end
- use_db && ActiveRecord::Base.connection.active? &&
+ use_db && ActiveRecord::Base.connected? &&
# The following condition is important: if a migrations adds a
# column to the application_settings table and a validation in
# the ApplicationSetting uses this new column we might end-up in