diff options
Diffstat (limited to 'doc/user/project')
-rw-r--r-- | doc/user/project/clusters/index.md | 4 | ||||
-rw-r--r-- | doc/user/project/description_templates.md | 7 | ||||
-rw-r--r-- | doc/user/project/merge_requests/approvals/settings.md | 2 | ||||
-rw-r--r-- | doc/user/project/time_tracking.md | 11 |
4 files changed, 16 insertions, 8 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index 97296d22dd9..8dd8ed52dd7 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -31,7 +31,7 @@ Besides integration at the project level, Kubernetes clusters can also be integrated at the [group level](../../group/clusters/index.md) or [GitLab instance level](../../instance/clusters/index.md). -To view your project level Kubernetes clusters, navigate to **Infrastructure > Kubernetes** +To view your project level Kubernetes clusters, navigate to **Infrastructure > Kubernetes clusters** from your project. On this page, you can [add a new cluster](#adding-and-removing-clusters) and view information about your existing clusters, such as: @@ -187,7 +187,7 @@ your cluster. This can cause deployment jobs to fail. To clear the cache: -1. Navigate to your project's **Infrastructure > Kubernetes** page, and select your cluster. +1. Navigate to your project's **Infrastructure > Kubernetes clusters** page, and select your cluster. 1. Expand the **Advanced settings** section. 1. Click **Clear cluster cache**. diff --git a/doc/user/project/description_templates.md b/doc/user/project/description_templates.md index d2897c7310e..711d7f561e4 100644 --- a/doc/user/project/description_templates.md +++ b/doc/user/project/description_templates.md @@ -116,12 +116,13 @@ Only instance administrators can set instance-level templates. To set the instance-level description template repository: -1. Select the **Admin Area** icon (**{admin}**). -1. Go to **Settings > Templates**. +1. On the top bar, select **Menu >** **{admin}** **Admin**. +1. On the left sidebar, select **Settings > Templates**. +1. Expand **Templates** 1. From the dropdown, select your template project as the template repository at instance level. 1. Select **Save changes**. -![Setting templates in the Admin Area](../admin_area/settings/img/file_template_admin_area.png) +![Setting templates in the Admin Area](../admin_area/settings/img/file_template_admin_area_v14_0.png) Learn more about [instance template repository](../admin_area/settings/instance_template_repository.md). diff --git a/doc/user/project/merge_requests/approvals/settings.md b/doc/user/project/merge_requests/approvals/settings.md index 97e4b7da396..b72a4125d0e 100644 --- a/doc/user/project/merge_requests/approvals/settings.md +++ b/doc/user/project/merge_requests/approvals/settings.md @@ -34,7 +34,7 @@ on merge requests, you can disable this setting: 1. Select the **Prevent users from modifying MR approval rules in merge requests** checkbox. 1. Select **Save changes**. -TODO This change affects all open merge requests. +This change affects all open merge requests. ## Reset approvals on push diff --git a/doc/user/project/time_tracking.md b/doc/user/project/time_tracking.md index 3c9b0341661..b7fd14ae74b 100644 --- a/doc/user/project/time_tracking.md +++ b/doc/user/project/time_tracking.md @@ -109,8 +109,15 @@ Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h. > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/29469/) in GitLab 12.1. -In GitLab self-managed instances, the display of time units can be limited to -hours through the option in **Admin Area > Settings > Preferences** under **Localization**. +In GitLab self-managed instances, you can limit the display of time units to +hours. +To do so: + +1. On the top bar, select **Menu >** **{admin}** **Admin**. +1. On the left sidebar, select **Settings > Preferences**. +1. Expand **Localization**. +1. Under **Time tracking**, select the **Limit display of time tracking units to hours** checkbox. +1. Select **Save changes**. With this option enabled, `75h` is displayed instead of `1w 4d 3h`. |