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 | |
| 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')
5 files changed, 10 insertions, 5 deletions
diff --git a/lib/gitlab/import_export/group/import_export.yml b/lib/gitlab/import_export/group/import_export.yml index aceb4821a06..4786c7a52cc 100644 --- a/lib/gitlab/import_export/group/import_export.yml +++ b/lib/gitlab/import_export/group/import_export.yml @@ -70,11 +70,14 @@ ee: - :award_emoji - events: - :push_event_payload + - label_links: + - :label - notes: - :author - :award_emoji - events: - :push_event_payload + - :system_note_metadata - boards: - :board_assignee - :milestone diff --git a/lib/gitlab/import_export/group/legacy_import_export.yml b/lib/gitlab/import_export/group/legacy_import_export.yml index 19611e1b010..0a6234f9f02 100644 --- a/lib/gitlab/import_export/group/legacy_import_export.yml +++ b/lib/gitlab/import_export/group/legacy_import_export.yml @@ -72,6 +72,8 @@ ee: - :award_emoji - events: - :push_event_payload + - label_links: + - :label - notes: - :author - :award_emoji 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 diff --git a/lib/gitlab/import_export/group/tree_restorer.rb b/lib/gitlab/import_export/group/tree_restorer.rb index ea7de4cc896..19d707aaca5 100644 --- a/lib/gitlab/import_export/group/tree_restorer.rb +++ b/lib/gitlab/import_export/group/tree_restorer.rb @@ -118,7 +118,7 @@ module Gitlab def relation_reader strong_memoize(:relation_reader) do - ImportExport::JSON::NdjsonReader.new( + ImportExport::Json::NdjsonReader.new( File.join(shared.export_path, 'tree') ) end diff --git a/lib/gitlab/import_export/group/tree_saver.rb b/lib/gitlab/import_export/group/tree_saver.rb index 0f588a55f9d..796b9258e57 100644 --- a/lib/gitlab/import_export/group/tree_saver.rb +++ b/lib/gitlab/import_export/group/tree_saver.rb @@ -42,7 +42,7 @@ module Gitlab end def serialize(group) - ImportExport::JSON::StreamingSerializer.new( + ImportExport::Json::StreamingSerializer.new( group, group_tree, json_writer, @@ -64,7 +64,7 @@ module Gitlab end def json_writer - @json_writer ||= ImportExport::JSON::NdjsonWriter.new(@full_path) + @json_writer ||= ImportExport::Json::NdjsonWriter.new(@full_path) end end end |