Add latest changes from gitlab-org/gitlab@master

6 files changed, 26 insertions, 9 deletions

diff --git a/doc/user/project/import/bitbucket.md b/doc/user/project/import/bitbucket.md
index a3a4de844ad..7114974d8db 100644
--- a/doc/user/project/import/bitbucket.md
+++ b/doc/user/project/import/bitbucket.md
@@ -65,6 +65,8 @@ For user contributions to be mapped, each user must complete the following befor
 
 ## Import your Bitbucket repositories
 
+> Ability to re-import projects [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/23905) in GitLab 15.9.
+
 1. Sign in to GitLab.
 1. On the top bar, select **New** (**{plus}**).
 1. Select **New project/repository**.
@@ -78,7 +80,9 @@ For user contributions to be mapped, each user must complete the following befor
    You can filter projects by name and select the namespace
    each project is imported for.
 
-   ![Import projects](img/bitbucket_import_select_project_v12_3.png)
+1. To import a project:
+   - For the first time: Select **Import**.
+   - Again: Select **Re-import**. Specify a new name and select **Re-import** again. Re-importing creates a new copy of the source project.
 
 ## Troubleshooting
 
diff --git a/doc/user/project/import/bitbucket_server.md b/doc/user/project/import/bitbucket_server.md
index db2a1d956ab..e6d2e3e00b6 100644
--- a/doc/user/project/import/bitbucket_server.md
+++ b/doc/user/project/import/bitbucket_server.md
@@ -24,6 +24,8 @@ created as private in GitLab as well.
 
 ## Import your Bitbucket repositories
 
+> Ability to re-import projects [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/23905) in GitLab 15.9.
+
 Prerequisites:
 
 - An administrator must enable **Bitbucket Server** in  **Admin > Settings > General > Visibility and access controls > Import sources**.
@@ -40,6 +42,9 @@ To import your Bitbucket repositories:
 1. Log in to Bitbucket and grant GitLab access to your Bitbucket account.
 1. Select the projects to import, or import all projects. You can filter projects by name and select
    the namespace for which to import each project.
+1. To import a project:
+   - For the first time: Select **Import**.
+   - Again: Select **Re-import**. Specify a new name and select **Re-import** again. Re-importing creates a new copy of the source project.
 
 ### Items that are not imported
 
diff --git a/doc/user/project/import/fogbugz.md b/doc/user/project/import/fogbugz.md
index 08ee4c70dda..d9e03662434 100644
--- a/doc/user/project/import/fogbugz.md
+++ b/doc/user/project/import/fogbugz.md
@@ -7,6 +7,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Import your project from FogBugz to GitLab **(FREE)**
 
+> Ability to re-import projects [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/23905) in GitLab 15.9.
+
 Using the importer, you can import your FogBugz project to GitLab.com
 or to your self-managed GitLab instance.
 
@@ -33,4 +35,6 @@ To import your project from FogBugz:
    ![Import Project](img/fogbugz_import_select_project.png)
 1. After the import finishes, select the link to go to the project
    dashboard. Follow the directions to push your existing repository.
-   ![Finished](img/fogbugz_import_finished.png)
+1. To import a project:
+   - For the first time: Select **Import**.
+   - Again: Select **Re-import**. Specify a new name and select **Re-import** again. Re-importing creates a new copy of the source project.
diff --git a/doc/user/project/import/gitea.md b/doc/user/project/import/gitea.md
index fb64c902b38..404bb4c8600 100644
--- a/doc/user/project/import/gitea.md
+++ b/doc/user/project/import/gitea.md
@@ -70,8 +70,8 @@ From there, you can view the import statuses of your Gitea repositories:
 
 - Those that are being imported show a _started_ status.
 - Those already successfully imported are green with a _done_ status.
-- Those that aren't yet imported have an **Import** button on the
-  right side of the table.
+- Those that aren't yet imported have **Import** on the right side of the table.
+- Those that are already imported have **Re-import** on the right side of the table.
 
 You also can:
 
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index 6234c9ef8de..177b6db99cf 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -146,7 +146,8 @@ You can choose to import these items, but this could significantly increase impo
 
 ### Select which repositories to import
 
-> Ability to cancel pending or active imports [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/247325) in GitLab 15.7.
+> - Ability to cancel pending or active imports [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/247325) in GitLab 15.7.
+> - Ability to re-import projects [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/23905) in GitLab 15.9.
 
 After you have authorized access to your GitHub repositories, you are redirected to the GitHub importer page and
 your GitHub repositories are listed.
@@ -168,6 +169,8 @@ If the import has already started, the imported files are kept.
 
 To open an repository in GitLab URL after it has been imported, select its GitLab path.
 
+Completed imports can be re-imported by selecting **Re-import** and specifying new name. This creates a new copy of the source project.
+
 ![GitHub importer page](img/import_projects_from_github_importer_v12_3.png)
 
 ## Mirror a repository and share pipeline status **(PREMIUM)**
diff --git a/doc/user/project/import/manifest.md b/doc/user/project/import/manifest.md
index a7e1af9412d..514a6a0cb5a 100644
--- a/doc/user/project/import/manifest.md
+++ b/doc/user/project/import/manifest.md
@@ -7,7 +7,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Import multiple repositories by uploading a manifest file **(FREE)**
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/28811) in GitLab 11.2.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/28811) in GitLab 11.2.
+> - Ability to re-import projects [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/23905) in GitLab 15.9.
 
 GitLab allows you to import all the required Git repositories
 based on a manifest file like the one used by the
@@ -59,6 +60,6 @@ To start the import:
 1. Select a group you want to import to (you need to create a group first if you don't have one).
 1. Select **List available repositories**. At this point, you are redirected
    to the import status page with projects list based on the manifest file.
-1. Check the list and select **Import all repositories** to start the import.
-
-   ![Manifest status](img/manifest_status_v13_3.png)
+1. To import:
+   - All projects for the first time: Select **Import all repositories**.
+   - Individual projects again: Select **Re-import**. Specify a new name and select **Re-import** again. Re-importing creates a new copy of the source project.