Add latest changes from gitlab-org/gitlab@master

14 files changed, 68 insertions, 55 deletions

diff --git a/doc/.vale/gitlab/CIConfigFile.yml b/doc/.vale/gitlab/CIConfigFile.yml
index 4d2ba454410..5cbd02e799b 100644
--- a/doc/.vale/gitlab/CIConfigFile.yml
+++ b/doc/.vale/gitlab/CIConfigFile.yml
@@ -10,8 +10,4 @@ link: https://docs.gitlab.com/ee/development/documentation/versions.html
 level: error
 scope: raw
 raw:
-  - '(`gitlab-ci.yml`|'
-  - '`gitlabci.yml`|'
-  - '`gitlab.ci.yml`|'
-  - '`.gitlab.ci-yml`|'
-  - '`.gitlab-ci.yaml`)'
+  - '(?!`\.gitlab-ci\.yml`)`.?gitlab.?ci.?ya?ml`'
diff --git a/doc/administration/audit_events.md b/doc/administration/audit_events.md
index cbff4031550..0f9f7eae1aa 100644
--- a/doc/administration/audit_events.md
+++ b/doc/administration/audit_events.md
@@ -159,11 +159,35 @@ You can view different events depending on the version of GitLab you have.
 
 The following actions on groups generate group audit events:
 
+#### Group management
+
 - Group name or path changed.
 - Group repository size limit changed.
 - Group created or deleted.
 - Group changed visibility.
 - User was added to group and with which [permissions](../user/permissions.md).
+- Removed user from group.
+- Project repository imported into group.
+- [Project shared with group](../user/project/members/share_project_with_groups.md) and with which
+  [permissions](../user/permissions.md).
+- Removal of a previously shared group with a project.
+- LFS enabled or disabled.
+- Membership lock enabled or disabled.
+- Request access enabled or disabled.
+- Roles allowed to create project changed.
+- Group deploy token was successfully created, revoked, or deleted.
+  [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/353452) in GitLab 14.9.
+- Failed attempt to create a group deploy token. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/353452)
+  in GitLab 14.9.
+- [IP restrictions](../user/group/access_and_permissions.md#restrict-group-access-by-ip-address) changed.
+  [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/358986) in GitLab 15.0.
+- Group had a security policy project linked, changed, or unlinked.
+  [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/377877) in GitLab 15.6.
+- An environment is protected or unprotected.
+  [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/216164) in GitLab 15.8.
+
+#### Authentication and authorization
+
 - User sign-in using [Group SAML](../user/group/saml_sso/index.md).
 - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/8071) in GitLab 14.5, changes to the following
   [group SAML](../user/group/saml_sso/index.md) configuration:
@@ -177,32 +201,28 @@ The following actions on groups generate group audit events:
   - Default membership role.
   - SSO-SAML group sync configuration.
 - Permissions changes of a user assigned to a group.
-- Removed user from group.
-- Project repository imported into group.
-- [Project shared with group](../user/project/members/share_project_with_groups.md) and with which
-  [permissions](../user/permissions.md).
-- Removal of a previously shared group with a project.
-- LFS enabled or disabled.
-- Shared runners minutes limit changed.
-- Membership lock enabled or disabled.
-- Request access enabled or disabled.
 - 2FA enforcement or grace period changed.
-- Roles allowed to create project changed.
-- Group CI/CD variable added, removed, or protected status changed.
-  [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/30857) in GitLab 13.3.
+
+#### Compliance and security
+
 - Compliance framework created, updated, or deleted.
   [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/340649) in GitLab 14.5.
 - Event streaming destination created, updated, or deleted.
   [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/344664) in GitLab 14.6.
+- Changes to push rules. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/227629) in GitLab 15.0.
+- Changes to streaming audit destination custom HTTP headers.
+  [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/366350) in GitLab 15.3.
 - Instance administrator started or stopped impersonation of a group member.
   [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/300961) in GitLab 14.8.
-- Group deploy token was successfully created, revoked, or deleted.
-  [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/353452) in GitLab 14.9.
-- Failed attempt to create a group deploy token. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/353452)
-  in GitLab 14.9.
-- [IP restrictions](../user/group/access_and_permissions.md#restrict-group-access-by-ip-address) changed.
-  [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/358986) in GitLab 15.0.
-- Changes to push rules. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/227629) in GitLab 15.0.
+
+#### CI/CD
+
+- Shared runners minutes limit changed.
+- Group CI/CD variable added, removed, or protected status changed.
+  [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/30857) in GitLab 13.3.
+
+#### Code collaboration
+
 - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/356152) in GitLab 15.1, changes to the following merge
   request approvals settings:
   - Prevent approval by author.
@@ -210,12 +230,6 @@ The following actions on groups generate group audit events:
   - Prevent editing approval rules in projects and merge requests.
   - Require user password to approve.
   - Remove all approvals when commits are added to the source branch.
-- Changes to streaming audit destination custom HTTP headers.
-  [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/366350) in GitLab 15.3.
-- Group had a security policy project linked, changed, or unlinked.
-  [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/377877) in GitLab 15.6.
-- An environment is protected or unprotected.
-  [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/216164) in GitLab 15.8.
 - Changes to Code Suggestions.
   [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/405295) in GitLab 15.11.
 
diff --git a/doc/administration/package_information/supported_os.md b/doc/administration/package_information/supported_os.md
index ea87dfb6e28..95630a7973f 100644
--- a/doc/administration/package_information/supported_os.md
+++ b/doc/administration/package_information/supported_os.md
@@ -15,6 +15,11 @@ operating systems supported by GitLab are listed in the
 
 The following lists the currently supported OSs and their possible EOL dates.
 
+NOTE:
+`amd64` and `x86_64` refer to the same 64-bit architecture.
+The names `arm64` and `aarch64` are also interchangeable and refer to the same
+architecture.
+
 | OS Version                                                   | First supported GitLab version | Arch            |                         Install Documentation                | OS EOL     | Details                                                      |
 | ------------------------------------------------------------ | ------------------------------ | --------------- | :----------------------------------------------------------: | ---------- | ------------------------------------------------------------ |
 | AlmaLinux 8                                                  | GitLab CE / GitLab EE 14.5.0   | x86_64, aarch64 | [AlmaLinux Install Documentation](https://about.gitlab.com/install/#almalinux-8) | 2029       | <https://almalinux.org/>                                     |
diff --git a/doc/api/rest/deprecations.md b/doc/api/rest/deprecations.md
index 7bfc9e1f59e..0299a2c4a73 100644
--- a/doc/api/rest/deprecations.md
+++ b/doc/api/rest/deprecations.md
@@ -31,6 +31,12 @@ has been deprecated in favor of the `detailed_merge_status` field which more cor
 all of the potential statuses that a merge request can be in. API users are encouraged to use the
 new `detailed_merge_status` field instead. The `merge_status` field will be removed in v5 of the GitLab REST API.
 
+### Null value for `private_profile` attribute in User API
+
+Breaking change. [Related issue](https://gitlab.com/gitlab-org/gitlab/-/issues/387005).
+
+When creating and updating users through the API, `null` was a valid value for the `private_profile` attribute, which would internally be converted to the default value. In v5 of the GitLab REST API, `null` will no longer be a valid value for this parameter, and the response will be a 400 if used. After this change, the only valid values will be `true` and `false`.
+
 ## Single merge request changes API endpoint
 
 Breaking change. [Related issue](https://gitlab.com/gitlab-org/gitlab/-/issues/322117).
diff --git a/doc/development/database/database_dictionary.md b/doc/development/database/database_dictionary.md
index 515bf00c6f0..84b76ddc34c 100644
--- a/doc/development/database/database_dictionary.md
+++ b/doc/development/database/database_dictionary.md
@@ -12,7 +12,8 @@ locate the feature categories responsible for specific database tables.
 ## Location
 
 Database dictionary metadata files are stored in the `gitlab` project under `db/docs/` for the `main` and `ci` databases.
-For the `geo` database, the dictionary files are stored under `ee/db/docs/`.
+For the `embedding` database, the dictionary files are stored under `ee/db/embedding/docs/`.
+For the `geo` database, the dictionary files are stored under `ee/db/geo/docs/`.
 
 ## Example dictionary file
 
@@ -51,7 +52,8 @@ When adding a table, you should:
    - `gitlab_main` table: `db/docs/`
    - `gitlab_ci` table: `db/docs/`
    - `gitlab_shared` table: `db/docs/`
-   - `gitlab_geo` table: `ee/db/docs/`
+   - `gitlab_embedding` table: `ee/db/embedding/docs/`
+   - `gitlab_geo` table: `ee/db/geo/docs/`
 1. Name the file `<table_name>.yml`, and include as much information as you know about the table.
 1. Include this file in the commit with the migration that creates the table.
 
@@ -79,7 +81,8 @@ When dropping a table, you should:
    - `gitlab_main` table: `db/docs/deleted_tables/`
    - `gitlab_ci` table: `db/docs/deleted_tables/`
    - `gitlab_shared` table: `db/docs/deleted_tables/`
-   - `gitlab_geo` table: `ee/db/docs/deleted_tables/`
+   - `gitlab_embedding` table: `ee/db/embedding/docs/deleted_tables/`
+   - `gitlab_geo` table: `ee/db/geo/docs/deleted_tables/`
 1. Add the fields `removed_by_url` and `removed_in_milestone` to the dictionary file.
 1. Include this change in the commit with the migration that drops the table.
 
@@ -105,7 +108,8 @@ When adding a new view, you should:
    - `gitlab_main` view: `db/docs/views/`
    - `gitlab_ci` view: `db/docs/views/`
    - `gitlab_shared` view: `db/docs/views/`
-   - `gitlab_geo` view: `ee/db/docs/views/`
+   - `gitlab_embedding` view: `ee/db/embedding/docs/views/`
+   - `gitlab_geo` view: `ee/db/geo/docs/views/`
 1. Name the file `<view_name>.yml`, and include as much information as you know about the view.
 1. Include this file in the commit with the migration that creates the view.
 
@@ -133,6 +137,7 @@ When dropping a view, you should:
    - `gitlab_main` view: `db/docs/deleted_views/`
    - `gitlab_ci` view: `db/docs/deleted_views/`
    - `gitlab_shared` view: `db/docs/deleted_views/`
-   - `gitlab_geo` view: `ee/db/docs/deleted_views/`
+   - `gitlab_embedding` view: `ee/db/embedding/docs/deleted_views/`
+   - `gitlab_geo` view: `ee/db/geo/docs/deleted_views/`
 1. Add the fields `removed_by_url` and `removed_in_milestone` to the dictionary file.
 1. Include this change in the commit with the migration that drops the view.
diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md
index c2c49d6afe3..7ef6a542993 100644
--- a/doc/integration/jira/connect-app.md
+++ b/doc/integration/jira/connect-app.md
@@ -104,7 +104,7 @@ It's not possible to create branches from Jira for self-managed instances. For m
 
 ### Set up your instance
 
-See [prerequisites](#prerequisites).
+[Prerequisites](#prerequisites)
 
 To set up your self-managed instance for the GitLab for Jira Cloud app in GitLab 15.7 and later:
 
@@ -116,7 +116,7 @@ To set up your self-managed instance for the GitLab for Jira Cloud app in GitLab
 
 ### Link your instance
 
-See [prerequisites](#prerequisites).
+[Prerequisites](#prerequisites)
 
 To link your self-managed instance to the GitLab for Jira Cloud app:
 
@@ -145,7 +145,7 @@ self-managed GitLab instances with Jira Cloud, you can do one of the following:
 
 ### Install the application in development mode
 
-See [prerequisites](#prerequisites-1).
+[Prerequisites](#prerequisites-1)
 
 To configure your Atlassian Cloud instance so you can install applications
 from outside the Marketplace:
@@ -173,12 +173,12 @@ then reinstall the application.
 
 ### Create a Marketplace listing
 
+[Prerequisites](#prerequisites-1)
+
 If you don't want to use development mode on your Jira instance, you can create
 your own Marketplace listing. This way, your application
 can be installed from the Atlassian Marketplace.
 
-See [prerequisites](#prerequisites-1).
-
 To create a Marketplace listing:
 
 1. Register as a Marketplace vendor.
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 1ebfff9acc5..53d1d356a77 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -1376,19 +1376,6 @@ and `config/redis.shared_state.yml` files.
 
 <div class="deprecation breaking-change" data-milestone="16.0">
 
-### Null value for `private_profile` attribute in User API is deprecated
-
-<div class="deprecation-notes">
-- Announced in: GitLab <span class="milestone">15.8</span>
-- [Breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/)
-</div>
-
-When creating and updating users through the API, `null` was a valid value for the `private_profile` attribute, which would internally be converted to the default value. Starting with 16.0, `null` will no longer be a valid value for this parameter, and the response will be a 400 if used. Now the only valid values are `true` and `false`.
-
-</div>
-
-<div class="deprecation breaking-change" data-milestone="16.0">
-
 ### Old versions of JSON web tokens are deprecated
 
 <div class="deprecation-notes">
diff --git a/doc/user/application_security/dast/proxy-based.md b/doc/user/application_security/dast/proxy-based.md
index ae2d04ae4bb..8b71e340a43 100644
--- a/doc/user/application_security/dast/proxy-based.md
+++ b/doc/user/application_security/dast/proxy-based.md
@@ -80,7 +80,7 @@ To enable DAST to run automatically, either:
 
 - Enable [Auto DAST](../../../topics/autodevops/stages.md#auto-dast) (provided
   by [Auto DevOps](../../../topics/autodevops/index.md)).
-- [Edit the `.gitlab.ci.yml` file manually](#edit-the-gitlab-ciyml-file-manually).
+- [Edit the `.gitlab-ci.yml` file manually](#edit-the-gitlab-ciyml-file-manually).
 - [Configure DAST using the UI](#configure-dast-using-the-ui).
 
 #### Edit the `.gitlab-ci.yml` file manually
diff --git a/doc/user/application_security/secret_detection/index.md b/doc/user/application_security/secret_detection/index.md
index b95abfdc1fc..b63db28bfc6 100644
--- a/doc/user/application_security/secret_detection/index.md
+++ b/doc/user/application_security/secret_detection/index.md
@@ -144,7 +144,7 @@ To enable Secret Detection, either:
 
 - Enable [Auto DevOps](../../../topics/autodevops/index.md), which includes [Auto Secret Detection](../../../topics/autodevops/stages.md#auto-secret-detection).
 
-- [Edit the `.gitlab.ci.yml` file manually](#edit-the-gitlab-ciyml-file-manually). Use this method
+- [Edit the `.gitlab-ci.yml` file manually](#edit-the-gitlab-ciyml-file-manually). Use this method
   if your `.gitlab-ci.yml` file is complex.
 
 - [Use an automatically configured merge request](#use-an-automatically-configured-merge-request).
diff --git a/doc/user/group/saml_sso/img/group_saml_configuration_information.png b/doc/user/group/saml_sso/img/group_saml_configuration_information.png
deleted file mode 100644
index e03c50ceb01..00000000000
--- a/doc/user/group/saml_sso/img/group_saml_configuration_information.png
+++ /dev/null
diff --git a/doc/user/group/saml_sso/img/group_saml_settings_v13_12.png b/doc/user/group/saml_sso/img/group_saml_settings_v13_12.png
deleted file mode 100644
index 2271f281655..00000000000
--- a/doc/user/group/saml_sso/img/group_saml_settings_v13_12.png
+++ /dev/null
diff --git a/doc/user/project/ml/experiment_tracking/img/candidate_v15_7.png b/doc/user/project/ml/experiment_tracking/img/candidate_v15_7.png
deleted file mode 100644
index fb2e2e706d6..00000000000
--- a/doc/user/project/ml/experiment_tracking/img/candidate_v15_7.png
+++ /dev/null
diff --git a/doc/user/project/ml/experiment_tracking/img/candidates_v15_7.png b/doc/user/project/ml/experiment_tracking/img/candidates_v15_7.png
deleted file mode 100644
index 58dfe94a108..00000000000
--- a/doc/user/project/ml/experiment_tracking/img/candidates_v15_7.png
+++ /dev/null
diff --git a/doc/user/project/ml/experiment_tracking/img/experiments_v15_7.png b/doc/user/project/ml/experiment_tracking/img/experiments_v15_7.png
deleted file mode 100644
index a7d4a3e559f..00000000000
--- a/doc/user/project/ml/experiment_tracking/img/experiments_v15_7.png
+++ /dev/null