summaryrefslogtreecommitdiff
path: root/doc/user/project
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-30 12:40:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-30 12:40:01 +0000
commitf19a0fa10a0024fab5ef3c556612944f2a62c298 (patch)
treeef5c359820d2409cf07c0610122299d314ec4743 /doc/user/project
parenteba52140851d2fb08665119c0a3997d0612ccb88 (diff)
downloadgitlab-ce-f19a0fa10a0024fab5ef3c556612944f2a62c298.tar.gz
Add latest changes from gitlab-org/security/gitlab@14-2-stable-ee
Diffstat (limited to 'doc/user/project')
-rw-r--r--doc/user/project/settings/import_export.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index a0718e875d7..52e064ef66e 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -44,7 +44,7 @@ Note the following:
- Group members are exported as project members, as long as the user has
a maintainer or administrator role in the group where the exported project lives.
- Project members with the [Owner role](../../permissions.md) are imported as Maintainers.
-- Imported users can be mapped by their primary email on self-managed instances, if an administrative user (not an owner) does the import.
+- Imported users can be mapped by their public email on self-managed instances, if an administrative user (not an owner) does the import.
Otherwise, a supplementary comment is left to mention that the original author and
the MRs, notes, or issues are owned by the importer.
- For project migration imports performed over GitLab.com Groups, preserving author information is