diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-06-16 15:13:09 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-06-16 15:13:09 -0500 |
| commit | dbddd69295d605167fc53e357ed0da7933cc751d (patch) | |
| tree | 8f7efa73d19b34bde31e45b037d2a1c42437ddf0 | |
| parent | 442bd2657c35afbe5d8dd1eb189a431b24308544 (diff) | |
| download | gitlab-ce-dbddd69295d605167fc53e357ed0da7933cc751d.tar.gz | |
Partially revert 1e8dbd46
See https://gitlab.com/gitlab-org/gitlab-ce/issues/33736#note_32561501
| -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 |