From cee66810f88ad7ba622c05529b2163e1d38b1b0f Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Fri, 23 Sep 2016 10:50:46 +0200 Subject: Remove use of `USE_DB` environment variable in code --- lib/gitlab/current_settings.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 76578978d5a..ef9160d6437 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -59,10 +59,8 @@ 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['SETUP_DB'] != 'false' && active_db_connection && - ActiveRecord::Base.connection.table_exists?('application_settings') - + ActiveRecord::Base.connection.table_exists?('application_settings') rescue ActiveRecord::NoDatabaseError false end -- cgit v1.2.3