Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 52 deletions

diff --git a/doc/user/admin_area/settings/security_and_compliance.md b/doc/user/admin_area/settings/security_and_compliance.md
index 54fd04f6521..8c1e514c575 100644
--- a/doc/user/admin_area/settings/security_and_compliance.md
+++ b/doc/user/admin_area/settings/security_and_compliance.md
@@ -1,25 +1,11 @@
 ---
-stage: Secure
-group: Composition Analysis
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: howto
+redirect_to: '../../../administration/settings/security_and_compliance.md'
+remove_date: '2023-10-13'
 ---
 
-# Security and Compliance Admin Area settings **(ULTIMATE SELF)**
+This document was moved to [another location](../../../administration/settings/security_and_compliance.md).
 
-The settings for package metadata synchronization are located in the [Admin Area](index.md).
-
-## Choose package registry metadata to sync
-
-WARNING:
-The full package metadata sync can add up to 30 GB to the PostgreSQL database. Ensure you have provisioned enough disk space for the database before enabling this feature.
-We are actively working on reducing this data size in [epic 10415](https://gitlab.com/groups/gitlab-org/-/epics/10415).
-
-To choose the packages you want to synchronize with the GitLab License Database for [License Compliance](../../compliance/license_scanning_of_cyclonedx_files/index.md):
-
-1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
-1. Select **Admin Area**.
-1. Select **Settings > Security and Compliance**.
-1. Expand **License Compliance**.
-1. Select or clear checkboxes for the package registries that you want to sync.
-1. Select **Save changes**.
+<!-- This redirect file can be deleted after <2023-10-13>. -->
+<!-- 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/admin_area/settings/sidekiq_job_limits.md b/doc/user/admin_area/settings/sidekiq_job_limits.md
index 08c3ced4c4e..81be26ec8e0 100644
--- a/doc/user/admin_area/settings/sidekiq_job_limits.md
+++ b/doc/user/admin_area/settings/sidekiq_job_limits.md
@@ -1,35 +1,11 @@
 ---
-stage: none
-group: unassigned
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
-type: reference
+redirect_to: '../../../administration/settings/sidekiq_job_limits.md'
+remove_date: '2023-10-13'
 ---
 
-# Sidekiq job size limits **(FREE SELF)**
+This document was moved to [another location](../../../administration/settings/sidekiq_job_limits.md).
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68982) in GitLab 14.3.
-
-[Sidekiq](../../../administration/sidekiq/index.md) jobs get stored in
-Redis. To avoid excessive memory for Redis, we:
-
-- Compress job arguments before storing them in Redis.
-- Reject jobs that exceed the specified threshold limit after compression.
-
-To access Sidekiq job size limits:
-
-1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
-1. Select **Admin Area**.
-1. Select **Settings > Preferences**.
-1. Expand **Sidekiq job size limits**.
-1. Adjust the compression threshold or size limit. The compression can
-   be disabled by selecting the **Track** mode.
-
-## Available settings
-
-| Setting                                   | Default          | Description                                                                                                                                                                   |
-|-------------------------------------------|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Limiting mode                             | Compress         | This mode compresses the jobs at the specified threshold and rejects them if they exceed the specified limit after compression.                                               |
-| Sidekiq job compression threshold (bytes) | 100 000 (100 KB) | When the size of arguments exceeds this threshold, they are compressed before being stored in Redis.                                                                          |
-| Sidekiq job size limit (bytes)            | 0                | The jobs exceeding this size after compression are rejected. This avoids excessive memory usage in Redis leading to instability. Setting it to 0 prevents rejecting jobs.     |
-
-After changing these values, [restart Sidekiq](../../../administration/restart_gitlab.md).
+<!-- This redirect file can be deleted after <2023-10-13>. -->
+<!-- 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 -->