Add latest changes from gitlab-org/gitlab@master

3 files changed, 22 insertions, 2 deletions

diff --git a/doc/ci/jobs/job_artifacts.md b/doc/ci/jobs/job_artifacts.md
index 0d8c9dcf715..0c9dd658ce2 100644
--- a/doc/ci/jobs/job_artifacts.md
+++ b/doc/ci/jobs/job_artifacts.md
@@ -276,6 +276,8 @@ Replace `<full-project-path>` with a valid project path, you can find it in the
 
 WARNING:
 Deleting the job log and artifacts is a destructive action that cannot be reverted. Use with caution.
+Deleting certain files, including report artifacts, job logs, and metadata files, affects
+GitLab features that use these files as data sources.
 
 You can delete a job's artifacts and log.
 
@@ -288,6 +290,24 @@ To delete a job:
 1. Go to a job's detail page.
 1. In the upper-right corner of the job's log, select **Erase job log and artifacts** (**{remove}**).
 
+You can also delete individual artifacts from the [**Artifacts** page](#bulk-delete-artifacts).
+
+### Bulk delete artifacts
+
+- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/33348) in GitLab 15.10 [with a flag](../../administration/feature_flags.md) named `ci_job_artifact_bulk_destroy`. Disabled by default.
+
+FLAG:
+On self-managed GitLab, by default this feature is not available. To make it available,
+ask an administrator to [enable the feature flag](../../administration/feature_flags.md) named `ci_job_artifact_bulk_destroy`.
+The feature is not ready for production use.
+
+You can delete multiple artifacts at the same time:
+
+1. On the top bar, select **Main menu > Projects** and find your project.
+1. On the left sidebar, select **CI/CD > Artifacts**.
+1. Select the checkboxes next to the artifacts you want to delete. You can select up to 50 artifacts.
+1. Select **Delete selected**.
+
 ## Link to job artifacts in the merge request UI
 
 Use the [`artifacts:expose_as`](../yaml/index.md#artifactsexpose_as) keyword to display
diff --git a/doc/ci/secrets/index.md b/doc/ci/secrets/index.md
index 6966a6baadf..db9f36f295a 100644
--- a/doc/ci/secrets/index.md
+++ b/doc/ci/secrets/index.md
@@ -53,7 +53,7 @@ and supports multiple secrets engines.
 
 To configure your Vault server:
 
-1. Ensure your Vault server is running on version 1.2.0 or higher.
+1. Ensure your Vault server is running on version 1.2.0 or later.
 1. Enable the authentication method by running these commands. They provide your Vault
    server the [JSON Web Key Set](https://www.rfc-editor.org/rfc/rfc7517) (JWKS) endpoint for your GitLab instance, so Vault
    can fetch the public signing key and verify the JSON Web Token (JWT) when authenticating:
diff --git a/doc/ci/services/index.md b/doc/ci/services/index.md
index f0d6e795a7c..2e7e89fc601 100644
--- a/doc/ci/services/index.md
+++ b/doc/ci/services/index.md
@@ -189,7 +189,7 @@ following these rules:
 - Slash (`/`) is replaced with double underscores (`__`) and the primary alias
   is created.
 - Slash (`/`) is replaced with a single dash (`-`) and the secondary alias is
-  created (requires GitLab Runner v1.1.0 or higher).
+  created (requires GitLab Runner v1.1.0 or later).
 
 To override the default behavior, you can
 [specify a service alias](#available-settings-for-services).