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/project/tree_saver.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/project/tree_saver.rb')
-rw-r--r-- | lib/gitlab/import_export/project/tree_saver.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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 |