Add latest changes from gitlab-org/gitlab@master

7 files changed, 62 insertions, 28 deletions

diff --git a/doc/administration/raketasks/project_import_export.md b/doc/administration/raketasks/project_import_export.md
index e8d2b36ab24..6d874d596e1 100644
--- a/doc/administration/raketasks/project_import_export.md
+++ b/doc/administration/raketasks/project_import_export.md
@@ -32,9 +32,10 @@ bundle exec rake gitlab:import_export:data RAILS_ENV=production
 
 Note the following:
 
-- Importing is not possible if the version of the import instance is older than that of the exporter.
-- The project import option must be enabled in application settings
-  (`/admin/application_settings/general`) under **Import sources**, which is available
+- Importing is only possible if the version of the import and export GitLab instances are
+  compatible as described in the [Version history](../../user/project/settings/import_export.md#version-history).
+- The project import option must be enabled in
+  application settings (`/admin/application_settings/general`) under **Import sources**, which is available
   under **{admin}** **Admin Area >** **{settings}** **Settings > Visibility and access controls**.
 - The exports are stored in a temporary [shared directory](../../development/shared_files.md)
   and are deleted every 24 hours by a specific worker.
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 125009adc35..c8a91d830a0 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -1986,7 +1986,20 @@ type Epic implements Noteable {
     """
     last: Int
   ): UserConnection
-  reference(full: Boolean = false): String!
+
+  """
+  Internal reference of the epic. Returned in shortened format by default
+  """
+  reference(
+    """
+    Indicates if the reference should be returned in full
+    """
+    full: Boolean = false
+  ): String!
+
+  """
+  URI path of the epic-issue relationship
+  """
   relationPath: String
 
   """
@@ -2043,7 +2056,15 @@ type Epic implements Noteable {
   Permissions for the current user on the resource
   """
   userPermissions: EpicPermissions!
+
+  """
+  Web path of the epic
+  """
   webPath: String!
+
+  """
+  Web URL of the epic
+  """
   webUrl: String!
 }
 
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 17a3d8eb2e2..08b84a1ca35 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -5013,11 +5013,11 @@
             },
             {
               "name": "reference",
-              "description": null,
+              "description": "Internal reference of the epic. Returned in shortened format by default",
               "args": [
                 {
                   "name": "full",
-                  "description": null,
+                  "description": "Indicates if the reference should be returned in full",
                   "type": {
                     "kind": "SCALAR",
                     "name": "Boolean",
@@ -5040,7 +5040,7 @@
             },
             {
               "name": "relationPath",
-              "description": null,
+              "description": "URI path of the epic-issue relationship",
               "args": [
 
               ],
@@ -5224,7 +5224,7 @@
             },
             {
               "name": "webPath",
-              "description": null,
+              "description": "Web path of the epic",
               "args": [
 
               ],
@@ -5242,7 +5242,7 @@
             },
             {
               "name": "webUrl",
-              "description": null,
+              "description": "Web URL of the epic",
               "args": [
 
               ],
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index beffd29d884..5e0b7465c20 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -295,8 +295,8 @@ Represents an epic.
 | `id` | ID! | ID of the epic |
 | `iid` | ID! | Internal ID of the epic |
 | `parent` | Epic | Parent epic of the epic |
-| `reference` | String! |  |
-| `relationPath` | String |  |
+| `reference` | String! | Internal reference of the epic. Returned in shortened format by default |
+| `relationPath` | String | URI path of the epic-issue relationship |
 | `relativePosition` | Int | The relative position of the epic in the epic tree |
 | `startDate` | Time | Start date of the epic |
 | `startDateFixed` | Time | Fixed start date of the epic |
@@ -308,8 +308,8 @@ Represents an epic.
 | `updatedAt` | Time | Timestamp of the epic's last activity |
 | `upvotes` | Int! | Number of upvotes the epic has received |
 | `userPermissions` | EpicPermissions! | Permissions for the current user on the resource |
-| `webPath` | String! |  |
-| `webUrl` | String! |  |
+| `webPath` | String! | Web path of the epic |
+| `webUrl` | String! | Web URL of the epic |
 
 ## EpicDescendantCount
 
diff --git a/doc/user/project/img/issue_boards_blocked_icon_v12_8.png b/doc/user/project/img/issue_boards_blocked_icon_v12_8.png
new file mode 100644
index 00000000000..ede57b760ed
--- /dev/null
+++ b/doc/user/project/img/issue_boards_blocked_icon_v12_8.png
diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md
index 06ecc224f5f..0a5d7805e41 100644
--- a/doc/user/project/issue_board.md
+++ b/doc/user/project/issue_board.md
@@ -303,6 +303,14 @@ Different issue board features are available in different [GitLab tiers](https:/
 | Premium / Silver | Multiple                       | Multiple                     | Yes                       | Yes            |
 | Ultimate / Gold | Multiple                       | Multiple                     | Yes                       | Yes            |
 
+## Blocked issues
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/34723) in GitLab 12.8.
+
+If an issue is blocked by another issue, an icon will display next to its title to differentiate it from unblocked issues.
+
+![Blocked issues](img/issue_boards_blocked_icon_v12_8.png)
+
 ## Actions you can take on an Issue Board
 
 - [Create a new list](#creating-a-new-list).
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index 2266534dc8f..cdf6a789ec2 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -6,28 +6,30 @@
 Existing projects running on any GitLab instance or GitLab.com can be exported with all their related
 data and be moved into a new GitLab instance.
 
+The **GitLab import/export** button is displayed if the project import option is enabled.
+
 See also:
 
-- [Project import/export API](../../../api/project_import_export.md).
-- [Project import/export administration rake tasks](../../../administration/raketasks/project_import_export.md). **(CORE ONLY)**
+- [Project import/export API](../../../api/project_import_export.md)
+- [Project import/export administration rake tasks](../../../administration/raketasks/project_import_export.md) **(CORE ONLY)**
+
+To set up a project import/export:
+
+  1. Navigate to **{admin}** **Admin Area >** **{settings}** **Settings > Visibility and access controls**.
+  1. Scroll to **Import sources**
+  1. Enable desired **Import sources**
 
 ## Important notes
 
 Note the following:
 
-- Importing is not possible if the import instance version differs from
-  that of the exporter.
-- The project import option must be enabled in application settings
-  (`/admin/application_settings/general`) under **Import sources**, which is
-  available under **{admin}** **Admin Area >** **{settings}** **Settings > Visibility and access controls**.
-  Ask your administrator if you don't see the **GitLab export** button when
-  creating a new project.
-- The exports are stored in a temporary [shared directory](../../../development/shared_files.md)
+- Imports will fail unless the import and export GitLab instances are
+  compatible as described in the [Version history](#version-history).
+- Exports are stored in a temporary [shared directory](../../../development/shared_files.md)
   and are deleted every 24 hours by a specific worker.
 - Group members are exported as project members, as long as the user has
-  maintainer or admin access to the group where the exported project lives. An admin
-  in the import side is required to map the users, based on email.
-  Otherwise, a supplementary comment is left to mention the original author and
+  maintainer or admin access to the group where the exported project lives. Import admins should map users by email address.
+  Otherwise, a supplementary comment is left to mention that the original author and
   the MRs, notes, or issues will be owned by the importer.
 - Project members with owner access will be imported as maintainers.
 - If an imported project contains merge requests originating from forks,
@@ -39,7 +41,7 @@ Note the following:
 
 The following table lists updates to Import/Export:
 
-| GitLab version   | Import/Export version |
+| GitLab version   | Import/Export schema version |
 | ---------------- | --------------------- |
 | 11.1 to current  | 0.2.4                 |
 | 10.8             | 0.2.3                 |
@@ -56,7 +58,9 @@ The following table lists updates to Import/Export:
 | 8.9.5            | 0.1.1                 |
 | 8.9.0            | 0.1.0                 |
 
-For example, 8.10.3 and 8.11 will have the same Import/Export version (0.1.3)
+Projects can be exported and imported only between versions of GitLab with matching Import/Export versions.
+
+For example, 8.10.3 and 8.11 have the same Import/Export version (0.1.3)
 and the exports between them will be compatible.
 
 ## Exported contents