diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-30 15:40:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-30 15:40:01 +0300 |
| commit | f19a0fa10a0024fab5ef3c556612944f2a62c298 (patch) | |
| tree | ef5c359820d2409cf07c0610122299d314ec4743 /lib/gitlab/import_export/group | |
| parent | eba52140851d2fb08665119c0a3997d0612ccb88 (diff) | |
Add latest changes from gitlab-org/security/gitlab@14-2-stable-ee
Diffstat (limited to 'lib/gitlab/import_export/group')
| -rw-r--r-- | lib/gitlab/import_export/group/import_export.yml | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/group/legacy_import_export.yml | 2 |
2 files changed, 2 insertions, 2 deletions
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 |