diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-02 06:13:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-02 06:13:01 +0300 |
commit | edfc0f680fdfbad9c4de23dba11caaf40b59be75 (patch) | |
tree | 8e71a214113af224cd40df91d6f55f26049ae6da /doc | |
parent | ef615776bf132cb0c56cafd51ac97fb1b7f26a58 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/api/projects.md | 4 | ||||
-rw-r--r-- | doc/ci/examples/authenticating-with-hashicorp-vault/index.md | 3 | ||||
-rw-r--r-- | doc/ci/secrets/index.md | 1 | ||||
-rw-r--r-- | doc/user/admin_area/settings/visibility_and_access_controls.md | 7 | ||||
-rw-r--r-- | doc/user/application_security/container_scanning/index.md | 3 | ||||
-rw-r--r-- | doc/user/group/index.md | 9 | ||||
-rw-r--r-- | doc/user/project/working_with_projects.md | 2 |
7 files changed, 15 insertions, 14 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md index 64d4846a721..d445fe6473e 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -2099,6 +2099,10 @@ This endpoint: - Deletes a project including all associated resources (including issues and merge requests). +- In [GitLab 12.6](https://gitlab.com/gitlab-org/gitlab/-/issues/32935) and later, on + [Premium or higher](https://about.gitlab.com/pricing/) tiers, + [delayed project deletion](../user/project/settings/index.md#delayed-project-deletion) + is applied if enabled. - From [GitLab 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) on [Premium or higher](https://about.gitlab.com/pricing/) tiers, group administrators can [configure](../user/group/index.md#enable-delayed-project-deletion) diff --git a/doc/ci/examples/authenticating-with-hashicorp-vault/index.md b/doc/ci/examples/authenticating-with-hashicorp-vault/index.md index 238c76b2c3c..1141583df3f 100644 --- a/doc/ci/examples/authenticating-with-hashicorp-vault/index.md +++ b/doc/ci/examples/authenticating-with-hashicorp-vault/index.md @@ -22,8 +22,7 @@ This tutorial assumes you are familiar with GitLab CI/CD and Vault. To follow along, you must have: - An account on GitLab. -- A running Vault server and access to it is required to configure authentication and create roles - and policies. For HashiCorp Vaults, this can be the Open Source or Enterprise version. +- Access to a running Vault server (at least v1.2.0) to configure authentication and to create roles and policies. For HashiCorp Vaults, this can be the Open Source or Enterprise version. NOTE: You must replace the `vault.example.com` URL below with the URL of your Vault server, and `gitlab.example.com` with the URL of your GitLab instance. diff --git a/doc/ci/secrets/index.md b/doc/ci/secrets/index.md index 829bdffbc6e..c0a763c80f0 100644 --- a/doc/ci/secrets/index.md +++ b/doc/ci/secrets/index.md @@ -53,6 +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. Enable the authentication method by running these commands. They provide your Vault server the [JSON Web Key Set](https://tools.ietf.org/html/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/user/admin_area/settings/visibility_and_access_controls.md b/doc/user/admin_area/settings/visibility_and_access_controls.md index 3a1b896d3a4..1087f50b215 100644 --- a/doc/user/admin_area/settings/visibility_and_access_controls.md +++ b/doc/user/admin_area/settings/visibility_and_access_controls.md @@ -97,8 +97,8 @@ delete a project. To allow only users with the Administrator role to delete proj > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/255449) in GitLab 14.2 for groups created after August 12, 2021. -Projects in a group (but not a personal namespace) can be deleted after a delayed period. -You can [configure it in group settings](../../group/index.md#enable-delayed-project-deletion). +[Delayed project deletion](../../project/settings/index.md#delayed-project-deletion) allows projects in a group (not a personal namespace) +to be deleted after a period of delay. To enable delayed project deletion by default in new groups: @@ -110,14 +110,13 @@ To enable delayed project deletion by default in new groups: > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32935) in GitLab 12.6. By default, a project marked for deletion is permanently removed with immediate effect. +See [delayed project deletion](../../project/settings/index.md#delayed-project-deletion) to learn more. By default, a group marked for deletion is permanently removed after seven days. WARNING: The default behavior of [Delayed Project deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/32935) in GitLab 12.6 was changed to [Immediate deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) in GitLab 13.2. -Projects in a group (but not a personal namespace) can be deleted after a delayed period, by -[configuring in Group Settings](../../group/index.md#enable-delayed-project-deletion). The default period is seven days, and can be changed. Setting this period to `0` enables immediate removal of projects or groups. diff --git a/doc/user/application_security/container_scanning/index.md b/doc/user/application_security/container_scanning/index.md index cc109fa4118..c633e7cd771 100644 --- a/doc/user/application_security/container_scanning/index.md +++ b/doc/user/application_security/container_scanning/index.md @@ -11,7 +11,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w INFO: Want to try out container scanning? -[Get a free 30-day trial GitLab Ultimate](https://about.gitlab.com/free-trial?glm_source=docs.gitlab.com&glm_content=u-container-scanning-docs). +[Get a free 30-day trial of GitLab Ultimate](https://about.gitlab.com/free-trial?glm_source=docs.gitlab.com&glm_content=u-container-scanning-docs). Your application's Docker image may itself be based on Docker images that contain known vulnerabilities. By including an extra job in your pipeline that scans for those vulnerabilities and @@ -135,6 +135,7 @@ You can [configure](#customizing-the-container-scanning-settings) analyzers by u | `CI_APPLICATION_TAG` | `$CI_COMMIT_SHA` | Docker repository tag for the image to be scanned. | All | | `CS_ANALYZER_IMAGE` | `registry.gitlab.com/security-products/container-scanning:4` | Docker image of the analyzer. | All | | `CS_DEFAULT_BRANCH_IMAGE` | `""` | The name of the `DOCKER_IMAGE` on the default branch. See [Setting the default branch image](#setting-the-default-branch-image) for more details. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/338877) in GitLab 14.5. | All | +| `CS_DISABLE_DEPENDENCY_SCAN` | `"true"` | Disable Dependency Scanning for packages installed in the scanned image. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/345434) in GitLab 14.6. | All | | `CS_DOCKER_INSECURE` | `"false"` | Allow access to secure Docker registries using HTTPS without validating the certificates. | All | | `CS_REGISTRY_INSECURE` | `"false"` | Allow access to insecure registries (HTTP only). Should only be set to `true` when testing the image locally. Works with all scanners, but the registry must listen on port `80/tcp` for Trivy to work. | All | | `CS_SEVERITY_THRESHOLD` | `UNKNOWN` | Severity level threshold. The scanner outputs vulnerabilities with severity level higher than or equal to this threshold. Supported levels are Unknown, Low, Medium, High, and Critical. | Trivy | diff --git a/doc/user/group/index.md b/doc/user/group/index.md index 13c86c56af7..9ec5343708e 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -672,12 +672,9 @@ To disable group mentions: > - [Inheritance and enforcement added](https://gitlab.com/gitlab-org/gitlab/-/issues/321724) in GitLab 13.11. > - [Instance setting to enable by default added](https://gitlab.com/gitlab-org/gitlab/-/issues/255449) in GitLab 14.2. -Projects can be configured to be deleted either: - -- Immediately. -- After a delayed interval. During this interval period, the projects are in a read-only state - and can be restored. The default interval period is seven days but - [is configurable](../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay). +[Delayed project deletion](../project/settings/index.md#delayed-project-deletion) can be enabled for groups. When enabled, projects in +the group are deleted after a period of delay. During this period, projects are in a read-only state and can be restored. The default +period is seven days but [is configurable at the instance level](../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay). On self-managed GitLab, projects are deleted immediately by default. In GitLab 14.2 and later, an administrator can diff --git a/doc/user/project/working_with_projects.md b/doc/user/project/working_with_projects.md index cd7ec329781..1c95f2bb5ec 100644 --- a/doc/user/project/working_with_projects.md +++ b/doc/user/project/working_with_projects.md @@ -248,7 +248,7 @@ To delete a project, first navigate to the home page for that project. 1. Click **Delete project** 1. Confirm this action by typing in the expected text. -Projects in personal namespaces are deleted immediately on request. For information on delayed deletion of projects in a group, please see [Enable delayed project deletion](../group/index.md#enable-delayed-project-deletion). +Projects in personal namespaces are deleted immediately on request. For information on delayed deletion of projects in a group, please see [delayed project deletion](settings/index.md#delayed-project-deletion). ## Project settings |