Add latest changes from gitlab-org/gitlab@12-10-stable-ee

6 files changed, 59 insertions, 1 deletions

diff --git a/doc/user/admin_area/settings/visibility_and_access_controls.md b/doc/user/admin_area/settings/visibility_and_access_controls.md
index 704dd89ede2..f827fed833b 100644
--- a/doc/user/admin_area/settings/visibility_and_access_controls.md
+++ b/doc/user/admin_area/settings/visibility_and_access_controls.md
@@ -91,7 +91,7 @@ For more details on group visibility, see [Public access](../../../public_access
 
 ## Restricted visibility levels
 
-To set the available visibility levels for new projects and snippets:
+To set the available visibility levels for projects, snippets, and selected pages:
 
 1. Check the desired visibility levels.
 1. Click **Save changes**.
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
new file mode 100644
index 00000000000..8983d685a24
--- /dev/null
+++ b/doc/user/project/import/img/jira/import_issues_from_jira_button_v12_10.png
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
new file mode 100644
index 00000000000..0ac5e9bdb91
--- /dev/null
+++ b/doc/user/project/import/img/jira/import_issues_from_jira_form_v12_10.png
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
new file mode 100644
index 00000000000..cf5f0dd59cd
--- /dev/null
+++ b/doc/user/project/import/img/jira/import_issues_from_jira_projects_v12_10.png
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index a114e23b3e2..a0da68eb513 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -15,6 +15,7 @@
 1. [By uploading a manifest file (AOSP)](manifest.md)
 1. [From Gemnasium](gemnasium.md)
 1. [From Phabricator](phabricator.md)
+1. [From Jira (issues only)](jira.md)
 
 In addition to the specific migration documentation above, you can import any
 Git repository via HTTP from the New Project page. Be aware that if the
diff --git a/doc/user/project/import/jira.md b/doc/user/project/import/jira.md
new file mode 100644
index 00000000000..49224001fe6
--- /dev/null
+++ b/doc/user/project/import/jira.md
@@ -0,0 +1,57 @@
+# Import your Jira project issues to GitLab
+
+> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2766) in GitLab 12.10.
+
+Using GitLab Jira importer, you can import your Jira issues to GitLab.com or to
+your self-managed GitLab instance.
+
+Jira issues import is an MVC, project-level feature, meaning that issues from multiple
+Jira projects can be imported into a GitLab project. MVC version imports issue title and description
+as well as some other issue metadata as a section in the issue description.
+
+## Prerequisites
+
+### Permissions
+
+In order to be able to import issues from a Jira project you need to have read access on Jira
+issues and a [Maintainer or higher](../../permissions.md#project-members-permissions) role in the
+GitLab project that you wish to import into.
+
+### Jira integration
+
+This feature uses the existing GitLab [Jira integration](../integrations/jira.md).
+
+Make sure you have the integration set up before trying to import Jira issues.
+
+## Import Jira issues to GitLab
+
+To import Jira issues to a GitLab project, follow the steps below.
+
+NOTE: **Note:**
+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**.
+
+   ![Import issues from Jira button](img/jira/import_issues_from_jira_button_v12_10.png)
+
+   The following form appears.
+
+   ![Import issues from Jira form](img/jira/import_issues_from_jira_form_v12_10.png)
+
+   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.
+
+1. Select the Jira project that you wish to import issues from.
+
+   ![Import issues from Jira form](img/jira/import_issues_from_jira_projects_v12_10.png)
+
+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)