From 28fd00aba5d09c390f7c5196aa90461afb607d62 Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Wed, 7 Nov 2018 12:52:18 -0800 Subject: Improve wording and consistency --- doc/raketasks/import.md | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/doc/raketasks/import.md b/doc/raketasks/import.md index dc7435e76d1..37ad62ef7be 100644 --- a/doc/raketasks/import.md +++ b/doc/raketasks/import.md @@ -88,15 +88,15 @@ more details. ### Which repositories are importable? -#### v10.3 or earlier +#### GitLab 10.3 or earlier Importing bare repositories from hashed storage is unsupported. -#### v10.4 and later +#### GitLab 10.4 and later -In order to support this, we began storing the full GitLab project path with -each repository, in a special section of the git repository's config file. This -section is formatted as follows: +To support importing bare repositories from hashed storage, GitLab 10.4 and +newer stores the full project path with each repository, in a special section of +the git repository's config file. This section is formatted as follows: ``` [gitlab] @@ -105,20 +105,21 @@ section is formatted as follows: However, existing repositories were not migrated to include this path. -The following are importable as bare repositories: +The following are importable as bare repositories if these events occurred in +GitLab 10.4 and later: -- Created in hashed storage in v10.4+ -- Migrated to hashed storage in v10.4+ -- Renamed in v10.4+ -- Transferred to another namespace in v10.4+ -- Ancestor renamed in v10.4+ -- Ancestor transferred to another namespace in v10.4+ +- Created +- Migrated to hashed storage +- Renamed +- Transferred to another namespace +- Ancestor renamed +- Ancestor transferred to another namespace -The following are **not** importable as bare repositories: +Bare repositories are **not** importable by GitLab 10.4 and later when all the following are true about the repository: -- Created in or migrated to hashed storage in v10.3 or earlier, and was not - renamed or transferred in v10.4+, and whose ancestor namespaces were not - renamed or transferred in v10.4+. +- It was created in GitLab 10.3 or earlier. +- It was not renamed, transferred, or migrated to hashed storage in GitLab 10.4 and later. +- Its ancestor namespaces were not renamed or transferred in GitLab 10.4 and later. There is an [open issue to add a migration to make all bare repositories importable](https://gitlab.com/gitlab-org/gitlab-ce/issues/41776). -- cgit v1.2.1