diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-13 15:12:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-13 15:12:01 +0300 |
| commit | 447ad69728c0cb35db1190694f29806cf7c59a88 (patch) | |
| tree | 43bbb4de84f19663cc3a19c32e8585310f42672a /doc/administration | |
| parent | ce79b3dd66d0e9616d547f90a93cce0b709407a3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/monitoring/prometheus/gitlab_exporter.md | 2 | ||||
| -rw-r--r-- | doc/administration/settings/visibility_and_access_controls.md | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/administration/monitoring/prometheus/gitlab_exporter.md b/doc/administration/monitoring/prometheus/gitlab_exporter.md index 427f6a28c22..75400535e60 100644 --- a/doc/administration/monitoring/prometheus/gitlab_exporter.md +++ b/doc/administration/monitoring/prometheus/gitlab_exporter.md @@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w > Renamed from `GitLab monitor exporter` to `GitLab exporter` in [GitLab 12.3](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16511). -The [GitLab exporter](https://gitlab.com/gitlab-org/gitlab-exporter) enables you to +The [GitLab exporter](https://gitlab.com/gitlab-org/ruby/gems/gitlab-exporter) enables you to measure various GitLab metrics pulled from Redis and the database in Linux package instances. diff --git a/doc/administration/settings/visibility_and_access_controls.md b/doc/administration/settings/visibility_and_access_controls.md index 93dbfaaf990..11652d8ee9a 100644 --- a/doc/administration/settings/visibility_and_access_controls.md +++ b/doc/administration/settings/visibility_and_access_controls.md @@ -85,10 +85,11 @@ To configure delayed project deletion: 1. Select **Settings > General**. 1. Expand the **Visibility and access controls** section. 1. Scroll to: - - (In GitLab 15.11 and later with `always_perform_delayed_deletion` feature flag enabled, or GitLab 16.0 and later) **Deletion protection** and set the retention period to a value between `1` and `90`. - - (GitLab 15.1 and later) **Deletion protection** and select keep deleted groups and projects, and select a retention period. - - (GitLab 15.0 and earlier) **Default delayed project protection** and select **Enable delayed project deletion by - default for newly-created groups.** Then set a retention period in **Default deletion delay**. + - In GitLab 16.0 and later: **Deletion protection** and set the retention period to a value between `1` and `90`. + - In GitLab 15.11 with `always_perform_delayed_deletion` feature flag enabled: **Deletion protection** and set the retention period to a value between `1` and `90`. + - In GitLab 15.1 to 15.10: **Deletion protection** and select **Keep deleted groups and projects**, then set the retention period. + - In GitLab 15.0 and earlier: **Default delayed project protection** and select **Enable delayed project deletion by + default for newly-created groups**, then set the retention period. 1. Select **Save changes**. Deletion protection is not available for projects only (without being also being enabled for groups). |