summaryrefslogtreecommitdiff
path: root/doc/user/project/import
diff options
context:
space:
mode:
Diffstat (limited to 'doc/user/project/import')
-rw-r--r--doc/user/project/import/gemnasium.md2
-rw-r--r--doc/user/project/import/img/jira/import_issues_from_jira_button_v12_10.pngbin8504 -> 8422 bytes
-rw-r--r--doc/user/project/import/img/jira/import_issues_from_jira_form_v12_10.pngbin116641 -> 56306 bytes
-rw-r--r--doc/user/project/import/img/jira/import_issues_from_jira_form_v13_2.pngbin0 -> 108152 bytes
-rw-r--r--doc/user/project/import/img/jira/import_issues_from_jira_projects_v12_10.pngbin521845 -> 0 bytes
-rw-r--r--doc/user/project/import/jira.md33
6 files changed, 22 insertions, 13 deletions
diff --git a/doc/user/project/import/gemnasium.md b/doc/user/project/import/gemnasium.md
index 0d6e059f1cf..3838289aec4 100644
--- a/doc/user/project/import/gemnasium.md
+++ b/doc/user/project/import/gemnasium.md
@@ -105,7 +105,7 @@ back to both GitLab and GitHub when completed.
1. The result of the job will be visible directly from the pipeline view:
- ![Security Dashboard](../../application_security/security_dashboard/img/pipeline_security_dashboard_v12_6.png)
+ ![Security Dashboard](../../application_security/security_dashboard/img/pipeline_security_dashboard_v13_2.png)
NOTE: **Note:**
If you don't commit very often to your project, you may want to use
diff --git a/doc/user/project/import/img/jira/import_issues_from_jira_button_v12_10.png b/doc/user/project/import/img/jira/import_issues_from_jira_button_v12_10.png
index 4ab42485d0b..3c1dc44df93 100644
--- a/doc/user/project/import/img/jira/import_issues_from_jira_button_v12_10.png
+++ b/doc/user/project/import/img/jira/import_issues_from_jira_button_v12_10.png
Binary files differ
diff --git a/doc/user/project/import/img/jira/import_issues_from_jira_form_v12_10.png b/doc/user/project/import/img/jira/import_issues_from_jira_form_v12_10.png
index 6278cb5f970..d98ad2aaa6e 100644
--- a/doc/user/project/import/img/jira/import_issues_from_jira_form_v12_10.png
+++ b/doc/user/project/import/img/jira/import_issues_from_jira_form_v12_10.png
Binary files differ
diff --git a/doc/user/project/import/img/jira/import_issues_from_jira_form_v13_2.png b/doc/user/project/import/img/jira/import_issues_from_jira_form_v13_2.png
new file mode 100644
index 00000000000..9cbffe2bb36
--- /dev/null
+++ b/doc/user/project/import/img/jira/import_issues_from_jira_form_v13_2.png
Binary files differ
diff --git a/doc/user/project/import/img/jira/import_issues_from_jira_projects_v12_10.png b/doc/user/project/import/img/jira/import_issues_from_jira_projects_v12_10.png
deleted file mode 100644
index bf9728e0311..00000000000
--- a/doc/user/project/import/img/jira/import_issues_from_jira_projects_v12_10.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/import/jira.md b/doc/user/project/import/jira.md
index 0b8807bb9b3..395cca4726d 100644
--- a/doc/user/project/import/jira.md
+++ b/doc/user/project/import/jira.md
@@ -40,6 +40,8 @@ Make sure you have the integration set up before trying to import Jira issues.
## Import Jira issues to GitLab
+> New import form [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/216145) in GitLab 13.2.
+
To import Jira issues to a GitLab project, follow the steps below.
NOTE: **Note:**
@@ -47,27 +49,34 @@ Importing Jira issues is done as an asynchronous background job, which
may result in delays based on import queues load, system load, or other factors.
Importing large projects may take several minutes depending on the size of the import.
-1. On the **{issues}** **Issues** page, click the **Import Issues** (**{import}**) button.
-1. Select **Import from Jira**.
- This option is only visible if you have the [correct permissions](#permissions).
+1. On the **{issues}** **Issues** page, click **Import Issues** (**{import}**) **> Import from Jira**.
![Import issues from Jira button](img/jira/import_issues_from_jira_button_v12_10.png)
+ The **Import from Jira** option is only visible if you have the [correct permissions](#permissions).
+
The following form appears.
+ If you've previously set up the [Jira integration](../integrations/jira.md), you can now see
+ the Jira projects that you have access to in the dropdown.
+
+ ![Import issues from Jira form](img/jira/import_issues_from_jira_form_v13_2.png)
- ![Import issues from Jira form](img/jira/import_issues_from_jira_form_v12_10.png)
+1. Click the **Import from** dropdown and select the Jira project that you wish to import issues from.
- If you've previously set up the [Jira integration](../integrations/jira.md), you now see the Jira
- projects that you have access to in the dropdown.
+ In the **Jira-GitLab user mapping template** section, the table shows to which GitLab users your Jira
+ users will be mapped.
+ If it wasn't possible to match a Jira user with a GitLab user, the dropdown defaults to the user
+ conducting the import.
-1. Select the Jira project that you wish to import issues from.
+1. To change any of the suggested mappings, click the dropdown in the **GitLab username** column and
+ select the user you want to map to each Jira user.
- ![Import issues from Jira form](img/jira/import_issues_from_jira_projects_v12_10.png)
+ The dropdown may not show all the users, so use the search bar to find a specific
+ user in this GitLab project.
+
+1. Click **Continue**. You're presented with a confirmation that import has started.
-1. Click **Import Issues**. You're presented with a confirmation that import has started.
While the import is running in the background, you can navigate away from the import status page
to the issues page, and you'll see the new issues appearing in the issues list.
-1. To check the status of your import, go back to the Jira import page.
-
- ![Import issues from Jira button](img/jira/import_issues_from_jira_button_v12_10.png)
+1. To check the status of your import, go to the Jira import page again.