From 52e897dd14c423332188cae4785ecf6e1182cede Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Thu, 22 Sep 2016 17:25:52 +0200 Subject: Update `CurrentSettings` class that uses ENV --- lib/gitlab/current_settings.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 12fbb78c53e..76578978d5a 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -59,7 +59,7 @@ module Gitlab # When the DBMS is not available, an exception (e.g. PG::ConnectionBad) is raised active_db_connection = ActiveRecord::Base.connection.active? rescue false - ENV['USE_DB'] != 'false' && + ENV['SETUP_DB'] != 'false' && active_db_connection && ActiveRecord::Base.connection.table_exists?('application_settings') -- cgit v1.2.1