diff options
Diffstat (limited to 'doc/user/project')
| -rw-r--r-- | doc/user/project/clusters/add_eks_clusters.md | 2 | ||||
| -rw-r--r-- | doc/user/project/index.md | 2 | ||||
| -rw-r--r-- | doc/user/project/integrations/webhooks.md | 2 | ||||
| -rw-r--r-- | doc/user/project/settings/index.md | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/user/project/clusters/add_eks_clusters.md b/doc/user/project/clusters/add_eks_clusters.md index a1d957ce128..fbbc5050a1f 100644 --- a/doc/user/project/clusters/add_eks_clusters.md +++ b/doc/user/project/clusters/add_eks_clusters.md @@ -142,7 +142,7 @@ To create and add a new Kubernetes cluster to your project, group, or instance: - **Kubernetes cluster name** - The name you wish to give the cluster. - **Environment scope** - The [associated environment](index.md#setting-the-environment-scope-premium) to this cluster. - **Kubernetes version** - The Kubernetes version to use. Currently the only version supported is 1.14. - - **Role name** - Select the **EKS IAM role** you created earlier to allow Amazon EKS + - **Service role** - Select the **EKS IAM role** you created earlier to allow Amazon EKS and the Kubernetes control plane to manage AWS resources on your behalf. NOTE: **Note:** diff --git a/doc/user/project/index.md b/doc/user/project/index.md index 908007239ac..154cc882397 100644 --- a/doc/user/project/index.md +++ b/doc/user/project/index.md @@ -193,7 +193,7 @@ To remove a project, first navigate to the home page for that project. ### Delayed removal **(PREMIUM)** By default, clicking to remove a project is followed by a seven day delay. Admins can restore the project during this period of time. -This delay [may be changed by an admin](../admin_area/settings/visibility_and_access_controls.md#default-deletion-adjourned-period-premium-only). +This delay [may be changed by an admin](../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay-premium-only). Admins can view all projects pending deletion. If you're an administrator, go to the top navigation bar, click **Projects > Your projects**, and then select the **Removed projects** tab. From this tab an admin can restore any project. diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md index ac24e074b96..d8e8ab2fab7 100644 --- a/doc/user/project/integrations/webhooks.md +++ b/doc/user/project/integrations/webhooks.md @@ -35,7 +35,7 @@ Navigate to the webhooks page by going to your project's **Settings ➔ Webhooks**. NOTE: **Note:** -On GitLab.com, the [maximum number of webhooks](../../../user/gitlab_com/index.md#maximum-number-of-webhooks) per project, and per group, is limited. +On GitLab.com, the [maximum number of webhooks and their size](../../../user/gitlab_com/index.md#webhooks) per project, and per group, is limited. ## Version history diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index 2753add507e..77875c8faa7 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -237,7 +237,7 @@ This action: group admins can [configure](../../group/index.md#enabling-delayed-project-removal-premium) projects within a group to be deleted after a delayed period. When enabled, actual deletion happens after number of days -specified in [instance settings](../../admin_area/settings/visibility_and_access_controls.md#default-deletion-adjourned-period-premium-only). +specified in [instance settings](../../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay-premium-only). CAUTION: **Warning:** The default behavior of [Delayed Project deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/32935) in GitLab 12.6 was changed to |