diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-06-16 21:34:41 +0000 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-16 16:36:23 -0500 |
| commit | f56e51b705059927eac4033e0337a78ca26fbc06 (patch) | |
| tree | 9e80e5dc28d9caa0a47f4f56154e339900ff5d48 /lib | |
| parent | fcd47b1a510a0dd78e9f8435191a0c7ddbf59755 (diff) | |
| download | gitlab-ce-f56e51b705059927eac4033e0337a78ca26fbc06.tar.gz | |
Merge branch 'rs-revert-11842' into 'master'
Partially revert 1e8dbd46
See merge request !12236
Diffstat (limited to 'lib')
| -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 |