diff options
Diffstat (limited to 'lib/gitlab/import_export/project')
| -rw-r--r-- | lib/gitlab/import_export/project/tree_restorer.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/import_export/project/tree_saver.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/gitlab/import_export/project/tree_restorer.rb b/lib/gitlab/import_export/project/tree_restorer.rb index 113502b4e3c..d8992061524 100644 --- a/lib/gitlab/import_export/project/tree_restorer.rb +++ b/lib/gitlab/import_export/project/tree_restorer.rb @@ -56,13 +56,13 @@ module Gitlab def ndjson_relation_reader return unless Feature.enabled?(:project_import_ndjson, project.namespace, default_enabled: true) - ImportExport::JSON::NdjsonReader.new( + ImportExport::Json::NdjsonReader.new( File.join(shared.export_path, 'tree') ) end def legacy_relation_reader - ImportExport::JSON::LegacyReader::File.new( + ImportExport::Json::LegacyReader::File.new( File.join(shared.export_path, 'project.json'), relation_names: reader.project_relation_names, allowed_path: importable_path diff --git a/lib/gitlab/import_export/project/tree_saver.rb b/lib/gitlab/import_export/project/tree_saver.rb index 16012f3c0c0..1f0fa249390 100644 --- a/lib/gitlab/import_export/project/tree_saver.rb +++ b/lib/gitlab/import_export/project/tree_saver.rb @@ -14,7 +14,7 @@ module Gitlab end def save - ImportExport::JSON::StreamingSerializer.new( + ImportExport::Json::StreamingSerializer.new( exportable, reader.project_tree, json_writer, @@ -56,10 +56,10 @@ module Gitlab @json_writer ||= begin if ::Feature.enabled?(:project_export_as_ndjson, @project.namespace, default_enabled: true) full_path = File.join(@shared.export_path, 'tree') - Gitlab::ImportExport::JSON::NdjsonWriter.new(full_path) + Gitlab::ImportExport::Json::NdjsonWriter.new(full_path) else full_path = File.join(@shared.export_path, ImportExport.project_filename) - Gitlab::ImportExport::JSON::LegacyWriter.new(full_path, allowed_path: 'project') + Gitlab::ImportExport::Json::LegacyWriter.new(full_path, allowed_path: 'project') end end end |