From 84cfb33fbb60898f9b56137832b2c5abb622465c Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 17 Jun 2017 07:30:15 -0700 Subject: Revert "Merge branch 'rs-revert-11842' into 'master'" This reverts commit ad521bde1bb556709edd39d8a9aa67ee47605b91, reversing changes made to 3a38e5f1ab914bc4eaeecda6e18caaa7ca9ea5a7. --- lib/gitlab/current_settings.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 2fd5452dd78..48735fd197d 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -62,7 +62,8 @@ module Gitlab active_db_connection = ActiveRecord::Base.connection.active? rescue false active_db_connection && - ActiveRecord::Base.connection.table_exists?('application_settings') + ActiveRecord::Base.connection.table_exists?('application_settings') && + !ActiveRecord::Migrator.needs_migration? rescue ActiveRecord::NoDatabaseError false end -- cgit v1.2.1