diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-09-23 10:50:46 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-09-23 10:50:46 +0200 |
| commit | cee66810f88ad7ba622c05529b2163e1d38b1b0f (patch) | |
| tree | 002e2ded0b0f12542fa377600fdb48590ad64de9 | |
| parent | c2083b79974de34ffb2d44ec486c40323a99228c (diff) | |
| download | gitlab-ce-fix/database-seeds.tar.gz | |
Remove use of `USE_DB` environment variable in codefix/database-seeds
| -rw-r--r-- | lib/gitlab/current_settings.rb | 4 |
1 files changed, 1 insertions, 3 deletions
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 |