summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-09-22 17:25:52 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-09-22 17:25:52 +0200
commit52e897dd14c423332188cae4785ecf6e1182cede (patch)
tree6576258faa8a635046930f12928193d06c095f41
parent68771115441caef15f8302a23d9ea00824d192d8 (diff)
downloadgitlab-ce-52e897dd14c423332188cae4785ecf6e1182cede.tar.gz
Update `CurrentSettings` class that uses ENV
-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 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')