diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 15:09:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 15:09:01 +0300 |
| commit | 2c2dd5e36c4ed5f09f488be288882d98f9124d12 (patch) | |
| tree | ad4c478bb1c588387a881b26a7db7c3237b9d4f3 /doc/user | |
| parent | 2ff184ad761fbfbe25a3d827c8f704349963a8d2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/admin_area/settings/visibility_and_access_controls.md | 6 | ||||
| -rw-r--r-- | doc/user/project/operations/error_tracking.md | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/user/admin_area/settings/visibility_and_access_controls.md b/doc/user/admin_area/settings/visibility_and_access_controls.md index b5d708b5e04..6a02f15ff43 100644 --- a/doc/user/admin_area/settings/visibility_and_access_controls.md +++ b/doc/user/admin_area/settings/visibility_and_access_controls.md @@ -47,11 +47,13 @@ To ensure only admin users can delete projects: 1. Check the **Default project deletion protection** checkbox. 1. Click **Save changes**. -## Project deletion adjourned period **(PREMIUM ONLY)** +## Default deletion adjourned period **(PREMIUM ONLY)** > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/32935) in GitLab 12.6. -By default, project marked for deletion will be permanently removed after 7 days. This period may be changed. +By default, a project or group marked for removal will be permanently removed after 7 days. +This period may be changed, and setting this period to 0 will enable immediate removal +of projects or groups. To change this period: diff --git a/doc/user/project/operations/error_tracking.md b/doc/user/project/operations/error_tracking.md index 3fcf6e39ee0..47b153ddd7e 100644 --- a/doc/user/project/operations/error_tracking.md +++ b/doc/user/project/operations/error_tracking.md @@ -57,11 +57,11 @@ This page has: - Other details about the issue, including a full stack trace. - In [GitLab 12.7 and newer](https://gitlab.com/gitlab-org/gitlab/issues/36246), language and urgency are displayed. -By default, a **Create issue** button is displayed. Once you have used it to create an issue, the button is hidden. +By default, a **Create issue** button is displayed:  -If a link does exist, it will be shown in the details and the 'Create issue' button will change to a 'View issue' button: +If you create a GitLab issue from the error, the **Create issue** button will change to a **View issue** button:  |