Add latest changes from gitlab-org/gitlab@15-3-stable-ee

4 files changed, 62 insertions, 17 deletions

diff --git a/doc/api/groups.md b/doc/api/groups.md
index 588ab2a5821..9cbd12e664c 100644
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@@ -1444,7 +1444,7 @@ response attributes:
 | Attribute          | Type   | Description                                                                          |
 |:-------------------|:-------|:-------------------------------------------------------------------------------------|
 | `[].name`          | string | Name of the SAML group                                                               |
-| `[].access_level`  | string | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
+| `[].access_level`  | integer | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
 
 Example request:
 
@@ -1458,11 +1458,11 @@ Example response:
 [
   {
     "name": "saml-group-1",
-    "access_level": "Guest"
+    "access_level": 10
   },
   {
     "name": "saml-group-2",
-    "access_level": "Maintainer"
+    "access_level": 40
   }
 ]
 ```
@@ -1488,7 +1488,7 @@ response attributes:
 | Attribute      | Type   | Description                                                                          |
 |:---------------|:-------|:-------------------------------------------------------------------------------------|
 | `name`         | string | Name of the SAML group                                                               |
-| `access_level` | string | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
+| `access_level` | integer | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
 
 Example request:
 
@@ -1501,7 +1501,7 @@ Example response:
 ```json
 {
 "name": "saml-group-1",
-"access_level": "Guest"
+"access_level": 10
 }
 ```
 
@@ -1519,7 +1519,7 @@ Supported attributes:
 |:-------------------|:---------------|:---------|:-------------------------------------------------------------------------------------|
 | `id`               | integer/string | yes      | ID or [URL-encoded path of the group](index.md#namespaced-path-encoding)             |
 | `saml_group_name`  | string         | yes      | Name of a SAML group                                                                 |
-| `access_level`     | string         | yes      | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
+| `access_level`     | integer         | yes      | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
 
 If successful, returns [`201`](index.md#status-codes) and the following
 response attributes:
@@ -1527,7 +1527,7 @@ response attributes:
 | Attribute      | Type   | Description                                                                          |
 |:---------------|:-------|:-------------------------------------------------------------------------------------|
 | `name`         | string | Name of the SAML group                                                               |
-| `access_level` | string | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
+| `access_level` | integer | Minimum [access level](members.md#valid-access-levels) for members of the SAML group |
 
 Example request:
 
@@ -1540,7 +1540,7 @@ Example response:
 ```json
 {
 "name": "saml-group-1",
-"access_level": "Guest"
+"access_level": 10
 }
 ```
 
diff --git a/doc/api/settings.md b/doc/api/settings.md
index c736c0df1da..d11269113a1 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -274,6 +274,7 @@ listed in the descriptions of the relevant settings.
 | `container_registry_token_expire_delay`  | integer          | no                                   | Container Registry token duration in minutes. |
 | `package_registry_cleanup_policies_worker_capacity`  | integer          | no                  | Number of workers assigned to the packages cleanup policies. |
 | `deactivate_dormant_users`               | boolean          | no                                   | Enable [automatic deactivation of dormant users](../user/admin_area/moderate_users.md#automatically-deactivate-dormant-users). |
+| `deactivate_dormant_users_period`        | integer          | no                                   | Length of time (in days) after which a user is considered dormant. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/336747) in GitLab 15.3. |
 | `default_artifacts_expire_in`            | string           | no                                   | Set the default expiration time for each job's artifacts. |
 | `default_branch_name`                    | string           | no                                   | [Instance-level custom initial branch name](../user/project/repository/branches/default.md#instance-level-custom-initial-branch-name) ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/225258) in GitLab 13.2). |
 | `default_branch_protection`              | integer          | no                                   | Determine if developers can push to the default branch. Can take: `0` _(not protected, both users with the Developer role or Maintainer role can push new commits and force push)_, `1` _(partially protected, users with the Developer role or Maintainer role can push new commits, but cannot force push)_ or `2` _(fully protected, users with the Developer or Maintainer role cannot push new commits, but users with the Developer or Maintainer role can; no one can force push)_ as a parameter. Default is `2`. |
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index c89dd3f65f7..eca94fce2e9 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -200,6 +200,10 @@ The following table lists project permissions available for each role:
 | [Security dashboard](application_security/security_dashboard/index.md):<br>Use security dashboard                                                                                    |          |          | ✓         | ✓          | ✓        |
 | [Security dashboard](application_security/security_dashboard/index.md):<br>View vulnerability                                                                                        |          |          | ✓         | ✓          | ✓        |
 | [Security dashboard](application_security/security_dashboard/index.md):<br>View vulnerability findings in [dependency list](application_security/dependency_list/index.md)           |          |          | ✓         | ✓          | ✓        |
+| [Tasks](tasks.md):<br>Create (*18*)     | ✓        | ✓        | ✓         | ✓          | ✓        |
+| [Tasks](tasks.md):<br>Edit              |          | ✓         | ✓         | ✓          | ✓        |
+| [Tasks](tasks.md):<br>Remove from issue |          | ✓         | ✓         | ✓          | ✓        |
+| [Tasks](tasks.md):<br>Delete (*22*)     |          |           |            |            | ✓        |
 | [Terraform](infrastructure/index.md):<br>Read Terraform state                                                                                                                        |          |          | ✓         | ✓          | ✓        |
 | [Terraform](infrastructure/index.md):<br>Manage Terraform state                                                                                                                      |          |          |           | ✓          | ✓        |
 | [Test cases](../ci/test_cases/index.md):<br>Archive                                                                                                                                  |          | ✓        | ✓         | ✓          | ✓        |
@@ -235,10 +239,11 @@ The following table lists project permissions available for each role:
 16. In GitLab 14.5 or later, Guests are not allowed to [create incidents](../operations/incident_management/incidents.md#incident-creation).
     In GitLab 15.1 and later, a Guest who created an issue that was promoted to an incident cannot edit, close, or reopen their incident.
 17. In projects that accept contributions from external members, users can create, edit, and close their own merge requests.
-18. Authors and assignees of issues can modify the title and description even if they don't have the Reporter role.
+18. Authors and assignees can modify the title and description even if they don't have the Reporter role.
 19. Authors and assignees can close and reopen issues even if they don't have the Reporter role.
 20. The ability to view the Container Registry and pull images is controlled by the [Container Registry's visibility permissions](packages/container_registry/index.md#container-registry-visibility-permissions).
 21. Maintainers cannot create, demote, or remove Owners, and they cannot promote users to the Owner role. They also cannot approve Owner role access requests.
+22. Authors of tasks can delete them even if they don't have the Owner role, but they have to have at least the Guest role for the project.
 
 <!-- markdownlint-enable MD029 -->
 
diff --git a/doc/user/tasks.md b/doc/user/tasks.md
index b5c2c4eb3a5..16e5c85a354 100644
--- a/doc/user/tasks.md
+++ b/doc/user/tasks.md
@@ -38,25 +38,64 @@ to work items and adding custom work item types, visit
 [epic 6033](https://gitlab.com/groups/gitlab-org/-/epics/6033) or
 [Plan direction page](https://about.gitlab.com/direction/plan/).
 
+## View tasks
+
+View tasks in issues, in the **Child items** section.
+
+You can also [filter the list of issues](project/issues/managing_issues.md#filter-the-list-of-issues)
+for `Type = task`.
+
 ## Create a task
 
+Prerequisites:
+
+- You must have at least the Guest role for the project, or the project must be public.
+
 To create a task:
 
-1. In an issue description, create a [task list](markdown.md#task-lists).
-1. Hover over a task item and select **Create task** (**{doc-new}**).
+1. In an issue description, in the **Child items** section, select **Add a task**.
+1. Enter the task title.
+1. Select **Create task**.
 
 ## Edit a task
 
+Prerequisites:
+
+- You must have at least the Reporter role for the project.
+
 To edit a task:
 
-1. In the issue description, view the task links.
-1. Select a link. The task is displayed.
-   - To edit the description, select **Edit**, then select **Save**.
-   - To edit the title or state, make your changes, then select any area outside the field. The changes are saved automatically.
+1. In the issue description, in the **Child items** section, select the task you want to edit.
+   The task window opens.
+1. Optional. To edit the title, select it and make your changes.
+1. Optional. To edit the description, select the edit icon (**{pencil}**), make your changes, and
+   select **Save**.
+1. Select the close icon (**{close}**).
+
+## Remove a task from an issue
+
+Prerequisites:
+
+- You must have at least the Reporter role for the project.
+
+You can remove a task from an issue. The task is not deleted, but the two are no longer connected.
+It's not possible to connect them again.
+
+To remove a task from an issue:
+
+1. In the issue description, in the **Child items** section, next to the task you want to remove, select the options menu (**{ellipsis_v}**).
+1. Select **Remove task**.
 
 ## Delete a task
 
+Prerequisites:
+
+- You must either:
+  - Be the author of the task and have at least the Guest role for the project.
+  - Have the Owner role for the project.
+
 To delete a task:
 
-1. In the issue description, select the task.
-1. From the options menu (**{ellipsis_v}**), select **Delete task**.
+1. In the issue description, in the **Child items** section, select the task you want to edit.
+1. In the task window, in the options menu (**{ellipsis_v}**), select **Delete task**.
+1. Select **OK**.