Commit f56e51b7 authored by Stan Hu's avatar Stan Hu Committed by Clement Ho

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

Partially revert 1e8dbd46

See merge request !12236
parent fcd47b1a
......@@ -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
......
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