Add latest changes from gitlab-org/gitlab@master

4 files changed, 27 insertions, 0 deletions

diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index eb9b285803d..91d6717de7e 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -2160,6 +2160,11 @@ type Epic implements Noteable {
   hasIssues: Boolean!
 
   """
+  Indicates if the epic has a parent epic
+  """
+  hasParent: Boolean!
+
+  """
   Current health status of the epic
   """
   healthStatus: EpicHealthStatus
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index f6c3510d6dc..fb642b1222f 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -6337,6 +6337,24 @@
               "deprecationReason": null
             },
             {
+              "name": "hasParent",
+              "description": "Indicates if the epic has a parent epic",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "healthStatus",
               "description": "Current health status of the epic",
               "args": [
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 082d7decbf9..d1ea825bef3 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -359,6 +359,7 @@ Represents an epic.
 | `group` | Group! | Group to which the epic belongs |
 | `hasChildren` | Boolean! | Indicates if the epic has children |
 | `hasIssues` | Boolean! | Indicates if the epic has direct issues |
+| `hasParent` | Boolean! | Indicates if the epic has a parent epic |
 | `healthStatus` | EpicHealthStatus | Current health status of the epic |
 | `id` | ID! | ID of the epic |
 | `iid` | ID! | Internal ID of the epic |
diff --git a/doc/api/users.md b/doc/api/users.md
index 8d7dad7ae35..90aafcef035 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -75,6 +75,7 @@ GET /users
 | `order_by`   | string | no       | Return users ordered by `id`, `name`, `username`, `created_at`, or `updated_at` fields. Default is `id` |
 | `sort`       | string | no       | Return users sorted in `asc` or `desc` order. Default is `desc` |
 | `two_factor` | string | no       | Filter users by Two-factor authentication. Filter values are `enabled` or `disabled`. By default it returns all users |
+| `without_projects` | boolean | no | Filter users without projects. Default is `false` |
 
 ```json
 [
@@ -207,6 +208,8 @@ You can search users by creation date time range with:
 GET /users?created_before=2001-01-02T00:00:00.060Z&created_after=1999-01-02T00:00:00.060
 ```
 
+You can search for users without projects with: `/users?without_projects=true`
+
 You can filter by [custom attributes](custom_attributes.md) with:
 
 ```plaintext