diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-06-16 21:34:41 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-06-16 21:34:41 +0000 |
| commit | ad521bde1bb556709edd39d8a9aa67ee47605b91 (patch) | |
| tree | 95349926141b7c4c216811bb8228858f01ec2223 | |
| parent | 3a38e5f1ab914bc4eaeecda6e18caaa7ca9ea5a7 (diff) | |
| parent | dbddd69295d605167fc53e357ed0da7933cc751d (diff) | |
| download | gitlab-ce-ad521bde1bb556709edd39d8a9aa67ee47605b91.tar.gz | |
Merge branch 'rs-revert-11842' into 'master'
Partially revert 1e8dbd46
See merge request !12236
| -rw-r--r-- | lib/gitlab/current_settings.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 48735fd197d..2fd5452dd78 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -62,8 +62,7 @@ module Gitlab active_db_connection = ActiveRecord::Base.connection.active? rescue false active_db_connection && - ActiveRecord::Base.connection.table_exists?('application_settings') && - !ActiveRecord::Migrator.needs_migration? + ActiveRecord::Base.connection.table_exists?('application_settings') rescue ActiveRecord::NoDatabaseError false end |