From f19a0fa10a0024fab5ef3c556612944f2a62c298 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 30 Aug 2021 12:40:01 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@14-2-stable-ee --- lib/gitlab/import_export/group/import_export.yml | 2 +- lib/gitlab/import_export/group/legacy_import_export.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/gitlab/import_export/group') diff --git a/lib/gitlab/import_export/group/import_export.yml b/lib/gitlab/import_export/group/import_export.yml index 4786c7a52cc..630f918a78b 100644 --- a/lib/gitlab/import_export/group/import_export.yml +++ b/lib/gitlab/import_export/group/import_export.yml @@ -20,7 +20,7 @@ tree: included_attributes: user: - :id - - :email + - :public_email - :username author: - :name diff --git a/lib/gitlab/import_export/group/legacy_import_export.yml b/lib/gitlab/import_export/group/legacy_import_export.yml index 0a6234f9f02..082d2346f3d 100644 --- a/lib/gitlab/import_export/group/legacy_import_export.yml +++ b/lib/gitlab/import_export/group/legacy_import_export.yml @@ -20,7 +20,7 @@ tree: included_attributes: user: - :id - - :email + - :public_email - :username author: - :name -- cgit v1.2.3