Commit a991d2aa authored by Stan Hu's avatar Stan Hu

Merge branch...

Merge branch '11274-the-geo-db-test-prepare-rake-task-is-broken-after-upgrade-to-rails-5-1' into 'master'

Use #load_schema instead instead of #load_schema_for

Closes #11274

See merge request gitlab-org/gitlab-ee!11430
parents c43f4936 323cc272
......@@ -128,7 +128,7 @@ module Gitlab
Gitlab::Geo::DatabaseTasks.with_geo_db do
should_reconnect = ActiveRecord::Base.connection_pool.active_connection?
ActiveRecord::Schema.verbose = false
ActiveRecord::Tasks::DatabaseTasks.load_schema_for ActiveRecord::Base.configurations['test'], :ruby, ENV['SCHEMA']
ActiveRecord::Tasks::DatabaseTasks.load_schema ActiveRecord::Base.configurations['test'], :ruby, ENV['SCHEMA']
ensure
if should_reconnect
ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[ActiveRecord::Tasks::DatabaseTasks.env])
......
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