Add latest changes from gitlab-org/gitlab@master

9 files changed, 34 insertions, 99 deletions

diff --git a/doc/user/analytics/contributor_statistics.md b/doc/user/analytics/contributor_statistics.md
deleted file mode 100644
index b6f195e22ad..00000000000
--- a/doc/user/analytics/contributor_statistics.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'contributor_analytics.md'
-remove_date: '2023-03-06'
----
-
-This document was moved to [another location](contributor_analytics.md).
-
-<!-- This redirect file can be deleted after <YYYY-MM-DD>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/award_emojis.md b/doc/user/award_emojis.md
deleted file mode 100644
index 09f7b4c77fa..00000000000
--- a/doc/user/award_emojis.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'emoji_reactions.md'
-remove_date: '2023-12-20'
----
-
-This document was moved to [another location](emoji_reactions.md).
-
-<!-- This redirect file can be deleted after <2023-12-20>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/custom_roles.md b/doc/user/custom_roles.md
index 99e8b8b5d52..07e14494ada 100644
--- a/doc/user/custom_roles.md
+++ b/doc/user/custom_roles.md
@@ -1,24 +1,16 @@
 ---
 stage: Govern
-group: Authentication
+group: Authorization
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
 # Custom roles **(ULTIMATE ALL)**
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106256) in GitLab 15.7 [with a flag](../administration/feature_flags.md) named `customizable_roles`.
+> - [Custom roles feature introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106256) in GitLab 15.7 [with a flag](../administration/feature_flags.md) named `customizable_roles`.
 > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110810) in GitLab 15.9.
 > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114524) in GitLab 15.10.
-> - The ability for a custom role to view a vulnerability report [introduced](https://gitlab.com/groups/gitlab-org/-/epics/10160) in GitLab 16.1 [with a flag](../administration/feature_flags.md) named `custom_roles_vulnerability`.
-> - Ability to view a vulnerability report [enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123835) in GitLab 16.1.
-> - [Feature flag `custom_roles_vulnerability` removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124049) in GitLab 16.2.
 > - Ability to create and remove a custom role with the UI [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/393235) in GitLab 16.4.
-> - Ability to manage group members [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/17364) in GitLab 16.5.
-> - Ability to manage project access tokens [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/421778) in GitLab 16.5 [with a flag](../administration/feature_flags.md) named `manage_project_access_tokens`.
-> - Ability to archive projects [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/425957) in GitLab 16.7.
 > - Ability to use the UI to add a user to your group with a custom role, change a user's custom role, or remove a custom role from a group member [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/393239) in GitLab 16.7.
-> - Ability to delete projects [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/425959) in GitLab 16.8.
-> - Ability to manage group access tokens [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/428353) in GitLab 16.8.
 
 Custom roles allow group Owners or instance administrators to create roles
 specific to the needs of their organization.
@@ -28,6 +20,10 @@ For a demo of the custom roles feature, see [[Demo] Ultimate Guest can view code
 
 You can discuss individual custom role and permission requests in [issue 391760](https://gitlab.com/gitlab-org/gitlab/-/issues/391760).
 
+## Available permissions
+
+For more information on available permissions, see [custom abilities](custom_roles/abilities.md).
+
 ## Create a custom role
 
 Prerequisites:
@@ -98,28 +94,6 @@ In **Settings > Roles and Permissions**, the list of all custom roles displays t
 
 To create a custom role, you can also [use the API](../api/member_roles.md#add-a-member-role-to-a-group).
 
-### Available permissions
-
-The following permissions are available. You can add these permissions in any combination
-to a base role to create a custom role.
-
-Some permissions require having other permissions enabled first. For example, administration of vulnerabilities (`admin_vulnerability`) can only be enabled if reading vulnerabilities (`read_vulnerability`) is also enabled.
-
-These requirements are documented in the `Required permission` column in the following table.
-
-| Permission                      | Version                | Required permission  | Description |
-| ------------------------------- | -----------------------| -------------------- | ----------- |
-| `read_code`                     | GitLab 15.7 and later  | Not applicable       | View project code. Does not include the ability to pull code.  |
-| `read_vulnerability`            | GitLab 16.1 and later  | Not applicable       | View [vulnerability reports](application_security/vulnerability_report/index.md).  |
-| `admin_vulnerability`           | GitLab 16.1 and later  | `read_vulnerability` | Change the [status of vulnerabilities](application_security/vulnerabilities/index.md#vulnerability-status-values).  |
-| `read_dependency`               | GitLab 16.3 and later  | Not applicable       | View [project dependencies](application_security/dependency_list/index.md).  |
-| `admin_merge_request`           | GitLab 16.4 and later  | Not applicable       | View and approve [merge requests](project/merge_requests/index.md), revoke merge request approval, and view the associated merge request code. <br> Does not allow users to view or change merge request approval rules.  |
-| `manage_project_access_tokens`  | GitLab 16.5 and later  | Not applicable       | Create, delete, and list [project access tokens](project/settings/project_access_tokens.md).  |
-| `admin_group_member`            | GitLab 16.5 and later  | Not applicable       | Add or remove [group members](group/manage.md).  |
-| `archive_project`               | GitLab 16.7 and later  | Not applicable       | [Archive and unarchive projects](project/settings/migrate_projects.md#archive-a-project).  |
-| `remove_project`                | GitLab 16.8 and later  | Not applicable       | [Delete projects](project/working_with_projects.md#delete-a-project).  |
-| `manage_group_access_tokens`    | GitLab 16.8 and later  | Not applicable       | [Create, delete, and list group access tokens](group/settings/group_access_tokens.md).  |
-
 ## Billing and seat usage
 
 When you enable a custom role for a user with the Guest role, that user has
diff --git a/doc/user/custom_roles/abilities.md b/doc/user/custom_roles/abilities.md
new file mode 100644
index 00000000000..3e74fcc5a7d
--- /dev/null
+++ b/doc/user/custom_roles/abilities.md
@@ -0,0 +1,27 @@
+---
+stage: Govern
+group: Authorization
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# Available custom abilities
+
+The following abilities are available. You can add these abilities in any combination
+to a base role to create a custom role.
+
+Some abilities require having other abilities enabled first. For example, administration of vulnerabilities (`admin_vulnerability`) can only be enabled if reading vulnerabilities (`read_vulnerability`) is also enabled.
+
+These requirements are documented in the `Required ability` column in the following table.
+
+| Ability                      | Version                | Required ability  | Description |
+| ------------------------------- | -----------------------| -------------------- | ----------- |
+| `read_code`                     | [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106256) in GitLab 15.7 [with a flag](../../administration/feature_flags.md) named `customizable_roles`. [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114524) in GitLab 15.10.| Not applicable       | View project code. Does not include the ability to pull code.  |
+| `read_vulnerability`            | [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10160) in GitLab 16.1 [with a flag](../../administration/feature_flags.md) named `custom_roles_vulnerability`. [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124049) in GitLab 16.2. | Not applicable       | View [vulnerability reports](../application_security/vulnerability_report/index.md).  |
+| `admin_vulnerability`           | [Introduced in GitLab 16.1](https://gitlab.com/gitlab-org/gitlab/-/issues/412536).  | `read_vulnerability` | Change the [status of vulnerabilities](../application_security/vulnerabilities/index.md#vulnerability-status-values).  |
+| `read_dependency`               | [Introduced in GitLab 16.3](https://gitlab.com/gitlab-org/gitlab/-/issues/415255).  | Not applicable       | View [project dependencies](../application_security/dependency_list/index.md).  |
+| `admin_merge_request`           | [Introduced in GitLab 16.4](https://gitlab.com/gitlab-org/gitlab/-/issues/412708).  | Not applicable       | View and approve [merge requests](../project/merge_requests/index.md), revoke merge request approval, and view the associated merge request code. <br> Does not allow users to view or change merge request approval rules.  |
+| `manage_project_access_tokens`  | [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/421778) in GitLab 16.5 [with a flag](../../administration/feature_flags.md) named `manage_project_access_tokens`  | Not applicable       | Create, delete, and list [project access tokens](../project/settings/project_access_tokens.md).  |
+| `admin_group_member`            | [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/17364) in GitLab 16.5  | Not applicable       | Add or remove [group members](../group/manage.md).  |
+| `archive_project`               | [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/425957) in GitLab 16.7  | Not applicable       | [Archive and unarchive projects](../project/settings/migrate_projects.md#archive-a-project).  |
+| `remove_project`                | [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/425959) in GitLab 16.8  | Not applicable       | [Delete projects](../project/working_with_projects.md#delete-a-project).  |
+| `manage_group_access_tokens`    | [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/428353) in GitLab 16.8  | Not applicable       | [Create, delete, and list group access tokens](../group/settings/group_access_tokens.md).  |
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index 81e2f3d7a55..b903e422a59 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -425,7 +425,7 @@ a session if the browser is closed or the existing session expires.
 ## Related topics
 
 - [Create users](account/create_accounts.md)
-- [Sign in to your GitLab account](../../topics/authentication/index.md)
+- [Sign in to your GitLab account](../../administration/auth/index.md)
 - [Change your password](user_passwords.md)
 - Receive emails for:
   - [Sign-ins from unknown IP addresses or devices](notifications.md#notifications-for-unknown-sign-ins)
diff --git a/doc/user/project/repository/gpg_signed_commits/index.md b/doc/user/project/repository/gpg_signed_commits/index.md
deleted file mode 100644
index 592041ef4e2..00000000000
--- a/doc/user/project/repository/gpg_signed_commits/index.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../signed_commits/gpg.md'
-remove_date: '2023-12-01'
----
-
-This document was moved to [another location](../signed_commits/gpg.md).
-
-<!-- This redirect file can be deleted after <2023-12-01>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/project/repository/managing_large_repositories.md b/doc/user/project/repository/managing_large_repositories.md
deleted file mode 100644
index 1fedd8da20c..00000000000
--- a/doc/user/project/repository/managing_large_repositories.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'monorepos/index.md'
-remove_date: '2023-12-17'
----
-
-This document was moved to [another location](monorepos/index.md).
-
-<!-- This redirect file can be deleted after <2023-12-17>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/project/repository/ssh_signed_commits/index.md b/doc/user/project/repository/ssh_signed_commits/index.md
deleted file mode 100644
index 89e3d811dba..00000000000
--- a/doc/user/project/repository/ssh_signed_commits/index.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../signed_commits/ssh.md'
-remove_date: '2023-12-01'
----
-
-This document was moved to [another location](../signed_commits/ssh.md).
-
-<!-- This redirect file can be deleted after <2023-12-01>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/project/repository/x509_signed_commits/index.md b/doc/user/project/repository/x509_signed_commits/index.md
deleted file mode 100644
index ae418581820..00000000000
--- a/doc/user/project/repository/x509_signed_commits/index.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: '../signed_commits/x509.md'
-remove_date: '2023-12-01'
----
-
-This document was moved to [another location](../signed_commits/x509.md).
-
-<!-- This redirect file can be deleted after <2023-12-01>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->