Commit 9e7c8641 authored by Luke Duncalfe's avatar Luke Duncalfe

Merge branch 'pb-fix-relation-factory-connection' into 'master'

Fix usage of ActiveRecord::Base in importer code

See merge request gitlab-org/gitlab!81580
parents c8404640 2054d59b
......@@ -20,7 +20,6 @@ Database/MultipleDatabases:
- lib/gitlab/database.rb
- lib/gitlab/gitlab_import/importer.rb
- lib/gitlab/health_checks/db_check.rb
- lib/gitlab/import_export/base/relation_factory.rb
- lib/gitlab/import_export/group/relation_tree_restorer.rb
- lib/gitlab/legacy_github_import/importer.rb
- lib/gitlab/seeder.rb
......
......@@ -300,7 +300,7 @@ module Gitlab
return cache[table_name] if cache.has_key?(table_name)
index_exists =
ActiveRecord::Base.connection.index_exists?(
relation_class.connection.index_exists?(
relation_class.table_name,
importable_foreign_key,
unique: true)
......
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