Add latest changes from gitlab-org/gitlab@master

3 files changed, 8 insertions, 11 deletions

diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 50d5eeaf9ab..7fd6e78539e 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -6147,12 +6147,12 @@ type Project {
   """
   mergeRequest(
     """
-    The IID of the merge request, e.g., "1"
+    IID of the merge request, for example `1`
     """
     iid: String
 
     """
-    The list of IIDs of issues, e.g., [1, 2]
+    Array of IIDs of merge requests, for example `[1, 2]`
     """
     iids: [String!]
   ): MergeRequest
@@ -6177,12 +6177,12 @@ type Project {
     first: Int
 
     """
-    The IID of the merge request, e.g., "1"
+    IID of the merge request, for example `1`
     """
     iid: String
 
     """
-    The list of IIDs of issues, e.g., [1, 2]
+    Array of IIDs of merge requests, for example `[1, 2]`
     """
     iids: [String!]
 
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index c7281fcc638..a4210165c6d 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -18471,7 +18471,7 @@
               "args": [
                 {
                   "name": "iid",
-                  "description": "The IID of the merge request, e.g., \"1\"",
+                  "description": "IID of the merge request, for example `1`",
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -18481,7 +18481,7 @@
                 },
                 {
                   "name": "iids",
-                  "description": "The list of IIDs of issues, e.g., [1, 2]",
+                  "description": "Array of IIDs of merge requests, for example `[1, 2]`",
                   "type": {
                     "kind": "LIST",
                     "name": null,
@@ -18512,7 +18512,7 @@
               "args": [
                 {
                   "name": "iid",
-                  "description": "The IID of the merge request, e.g., \"1\"",
+                  "description": "IID of the merge request, for example `1`",
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -18522,7 +18522,7 @@
                 },
                 {
                   "name": "iids",
-                  "description": "The list of IIDs of issues, e.g., [1, 2]",
+                  "description": "Array of IIDs of merge requests, for example `[1, 2]`",
                   "type": {
                     "kind": "LIST",
                     "name": null,
diff --git a/doc/user/project/import/svn.md b/doc/user/project/import/svn.md
index faf282c8ac3..cf034aafca9 100644
--- a/doc/user/project/import/svn.md
+++ b/doc/user/project/import/svn.md
@@ -100,9 +100,6 @@ Running SubGit in a mirror mode requires a
 [registration](https://subgit.com/pricing). Registration is free for open
 source, academic and startup projects.
 
-We're currently working on deeper GitLab/SubGit integration. You may track our
-progress at [this issue](https://gitlab.com/gitlab-org/gitlab/issues/990).
-
 ### SubGit support
 
 For any questions related to SVN to GitLab migration with SubGit, you can