Commit 84cfb33f authored by Stan Hu's avatar Stan Hu

Revert "Merge branch 'rs-revert-11842' into 'master'"

This reverts commit ad521bde, reversing
changes made to 3a38e5f1.
parent f01c5d86
...@@ -62,7 +62,8 @@ module Gitlab ...@@ -62,7 +62,8 @@ module Gitlab
active_db_connection = ActiveRecord::Base.connection.active? rescue false active_db_connection = ActiveRecord::Base.connection.active? rescue false
active_db_connection && active_db_connection &&
ActiveRecord::Base.connection.table_exists?('application_settings') ActiveRecord::Base.connection.table_exists?('application_settings') &&
!ActiveRecord::Migrator.needs_migration?
rescue ActiveRecord::NoDatabaseError rescue ActiveRecord::NoDatabaseError
false false
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment