Remove use of `USE_DB` environment variable in code

2016-09-23 10:50:46 +02:00 · 2016-09-23 10:50:46 +02:00 · cee66810f8
parent c2083b7997
commit cee66810f8
1 changed files with 1 additions and 3 deletions
--- 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