diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/gitlab/import_export/group/legacy_tree_restorer.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/gitlab/import_export/group/legacy_tree_restorer.rb')
-rw-r--r-- | lib/gitlab/import_export/group/legacy_tree_restorer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/group/legacy_tree_restorer.rb b/lib/gitlab/import_export/group/legacy_tree_restorer.rb index 2b95c098b59..8b39362b6bb 100644 --- a/lib/gitlab/import_export/group/legacy_tree_restorer.rb +++ b/lib/gitlab/import_export/group/legacy_tree_restorer.rb @@ -55,11 +55,11 @@ module Gitlab def relation_reader strong_memoize(:relation_reader) do if @group_hash.present? - ImportExport::JSON::LegacyReader::Hash.new( + ImportExport::Json::LegacyReader::Hash.new( @group_hash, relation_names: reader.group_relation_names) else - ImportExport::JSON::LegacyReader::File.new( + ImportExport::Json::LegacyReader::File.new( File.join(shared.export_path, 'group.json'), relation_names: reader.group_relation_names) end |