From acab9fc89c5856e2d3d3a9af6ff2047cc69055d3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 8 Sep 2021 18:11:23 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/admin_area/appearance.md | 2 +- doc/user/admin_area/diff_limits.md | 2 +- doc/user/admin_area/index.md | 14 ++++++------- doc/user/admin_area/merge_requests_approvals.md | 2 +- doc/user/admin_area/monitoring/health_check.md | 2 +- .../settings/account_and_limit_settings.md | 22 ++++++++++---------- .../admin_area/settings/external_authorization.md | 2 +- doc/user/admin_area/settings/floc.md | 2 +- doc/user/admin_area/settings/help_page.md | 2 +- doc/user/admin_area/settings/index.md | 4 ++-- .../settings/instance_template_repository.md | 2 +- .../settings/project_integration_management.md | 6 +++--- .../settings/push_event_activities_limit.md | 2 +- .../settings/rate_limits_on_raw_endpoints.md | 2 +- .../admin_area/settings/sign_in_restrictions.md | 4 ++-- .../admin_area/settings/sign_up_restrictions.md | 12 +++++------ doc/user/admin_area/settings/terms.md | 2 +- .../admin_area/settings/user_and_ip_rate_limits.md | 2 +- .../settings/visibility_and_access_controls.md | 24 +++++++++++----------- doc/user/admin_area/user_cohorts.md | 2 +- doc/user/discussions/index.md | 8 ++++---- doc/user/group/index.md | 2 +- doc/user/group/saml_sso/index.md | 2 +- doc/user/group/settings/import_export.md | 2 +- doc/user/instance/clusters/index.md | 2 +- .../packages/terraform_module_registry/index.md | 4 ++++ doc/user/profile/account/delete_account.md | 2 +- doc/user/profile/active_sessions.md | 4 ++-- doc/user/profile/index.md | 4 ++-- doc/user/profile/notifications.md | 8 ++++---- doc/user/profile/personal_access_tokens.md | 6 +++--- doc/user/project/issues/managing_issues.md | 2 +- .../project/members/share_project_with_groups.md | 2 +- doc/user/project/pages/pages_access_control.md | 2 +- doc/user/project/repository/branches/default.md | 2 +- .../project/repository/gpg_signed_commits/index.md | 6 +++--- .../project/repository/repository_mirroring.md | 2 +- doc/user/project/web_ide/index.md | 2 +- 38 files changed, 89 insertions(+), 85 deletions(-) (limited to 'doc/user') diff --git a/doc/user/admin_area/appearance.md b/doc/user/admin_area/appearance.md index 67fe8994080..0ffa8289d37 100644 --- a/doc/user/admin_area/appearance.md +++ b/doc/user/admin_area/appearance.md @@ -12,7 +12,7 @@ There are several options for customizing the appearance of a self-managed insta of GitLab. To access these settings: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > Appearance**. +1. On the left sidebar, select **Settings > Appearance**. ## Navigation bar diff --git a/doc/user/admin_area/diff_limits.md b/doc/user/admin_area/diff_limits.md index 2e7841374be..b50748ca97e 100644 --- a/doc/user/admin_area/diff_limits.md +++ b/doc/user/admin_area/diff_limits.md @@ -34,7 +34,7 @@ set values are presented as **Too large** are cannot be expanded in the UI. To configure these values: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand **Diff limits**. 1. Enter a value for the diff limit. 1. Select **Save changes**. diff --git a/doc/user/admin_area/index.md b/doc/user/admin_area/index.md index faf1d8f1084..85eca17f6e7 100644 --- a/doc/user/admin_area/index.md +++ b/doc/user/admin_area/index.md @@ -72,7 +72,7 @@ You can administer all projects in the GitLab instance from the Admin Area's Pro To access the Projects page: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Overview > Projects**. +1. On the left sidebar, select **Overview > Projects**. 1. Select the **All**, **Private**, **Internal**, or **Public** tab to list only projects of that criteria. @@ -112,7 +112,7 @@ You can combine the filter options. For example, to list only public projects wi You can administer all users in the GitLab instance from the Admin Area's Users page: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Overview > Users**. +1. On the left sidebar, select **Overview > Users**. To list users matching a specific criteria, click on one of the following tabs on the **Users** page: @@ -157,7 +157,7 @@ You can impersonate a user in the following ways: - Through the UI: 1. On the top bar, select **Menu > Admin**. - 1. In the left sidebar, select **Overview > Users**. + 1. On the left sidebar, select **Overview > Users**. 1. From the list of users, select a user. 1. Select **Impersonate**. - With the API, using [impersonation tokens](../../api/index.md#impersonation-tokens). @@ -210,7 +210,7 @@ You can administer all groups in the GitLab instance from the Admin Area's Group To access the Groups page: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Overview > Groups**. +1. On the left sidebar, select **Overview > Groups**. For each group, the page displays their name, description, size, number of projects in the group, number of members, and whether the group is private, internal, or public. To edit a group, click @@ -232,7 +232,7 @@ You can administer all jobs in the GitLab instance from the Admin Area's Jobs pa To access the Jobs page: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Overview > Jobs**. All jobs are listed, in descending order of job ID. +1. On the left sidebar, select **Overview > Jobs**. All jobs are listed, in descending order of job ID. 1. Click the **All** tab to list all jobs. Click the **Pending**, **Running**, or **Finished** tab to list only jobs of that status. @@ -258,7 +258,7 @@ You can administer all runners in the GitLab instance from the Admin Area's **Ru To access the **Runners** page: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Overview > Runners**. +1. On the left sidebar, select **Overview > Runners**. The **Runners** page features: @@ -308,7 +308,7 @@ page. For more details, see [Gitaly](../../administration/gitaly/index.md). To access the **Gitaly Servers** page: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Overview > Gitaly Servers**. +1. On the left sidebar, select **Overview > Gitaly Servers**. For each Gitaly server, the following details are listed: diff --git a/doc/user/admin_area/merge_requests_approvals.md b/doc/user/admin_area/merge_requests_approvals.md index f4e99fbedc4..ffa08dee10d 100644 --- a/doc/user/admin_area/merge_requests_approvals.md +++ b/doc/user/admin_area/merge_requests_approvals.md @@ -16,7 +16,7 @@ project level. To enable merge request approval rules for an instance: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **{push-rules}** **Push Rules**, and expand **Merge request (MR) approvals**. +1. On the left sidebar, select **{push-rules}** **Push Rules**, and expand **Merge request (MR) approvals**. 1. Set the required rule. 1. Click **Save changes**. diff --git a/doc/user/admin_area/monitoring/health_check.md b/doc/user/admin_area/monitoring/health_check.md index 07704803da4..c5ffb032afd 100644 --- a/doc/user/admin_area/monitoring/health_check.md +++ b/doc/user/admin_area/monitoring/health_check.md @@ -147,7 +147,7 @@ An access token needs to be provided while accessing the probe endpoints. You ca find the current accepted token in the user interface: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Monitoring > Health Check**. (`admin/health_check`) +1. On the left sidebar, select **Monitoring > Health Check**. (`admin/health_check`) ![access token](img/health_check_token.png) diff --git a/doc/user/admin_area/settings/account_and_limit_settings.md b/doc/user/admin_area/settings/account_and_limit_settings.md index 17ea4ce04bb..dd578f5dc9b 100644 --- a/doc/user/admin_area/settings/account_and_limit_settings.md +++ b/doc/user/admin_area/settings/account_and_limit_settings.md @@ -12,7 +12,7 @@ type: reference You can change the default maximum number of projects that users can create in their personal namespace: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**, then expand **Account and limit**. +1. On the left sidebar, select **Settings > General**, then expand **Account and limit**. 1. Increase or decrease that **Default projects limit** value. If you set **Default projects limit** to 0, users are not allowed to create projects @@ -23,7 +23,7 @@ in their users personal namespace. However, projects can still be created in a g You can change the maximum file size for attachments in comments and replies in GitLab: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**, then expand **Account and limit**. +1. On the left sidebar, select **Settings > General**, then expand **Account and limit**. 1. Increase or decrease by changing the value in **Maximum attachment size (MB)**. NOTE: @@ -36,7 +36,7 @@ details. You can change the maximum push size for your repository: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**, then expand **Account and limit**. +1. On the left sidebar, select **Settings > General**, then expand **Account and limit**. 1. Increase or decrease by changing the value in **Maximum push size (MB)**. NOTE: @@ -51,7 +51,7 @@ Use [Git LFS](../../../topics/git/lfs/index.md) to add large files to a reposito You can change the maximum file size for imports in GitLab: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**, then expand **Account and limit**. +1. On the left sidebar, select **Settings > General**, then expand **Account and limit**. 1. Increase or decrease by changing the value in **Maximum import size (MB)**. NOTE: @@ -71,7 +71,7 @@ Only a GitLab administrator can set the prefix, which is a global setting applie to any PAT generated in the system by any user: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Account and limit** section. 1. Fill in the **Personal Access Token prefix** field. 1. Click **Save changes**. @@ -114,7 +114,7 @@ These settings can be found in: 1. Click **Save changes**. - GitLab global settings: 1. On the top bar, select **Menu > Admin**. - 1. In the left sidebar, select **Settings > General**. + 1. On the left sidebar, select **Settings > General**. 1. Expand the **Account and limit** section. 1. Fill in the **Size limit per repository (MB)** field. 1. Click **Save changes**. @@ -166,7 +166,7 @@ GitLab administrators can choose to customize the session duration (in minutes) To set a limit on how long these sessions are valid: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Account and limit** section. 1. Fill in the **Session duration for Git operations when 2FA is enabled (minutes)** field. 1. Click **Save changes**. @@ -191,7 +191,7 @@ there are no restrictions. To set a lifetime on how long personal access tokens are valid: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Account and limit** section. 1. Fill in the **Maximum allowable lifetime for personal access tokens (days)** field. 1. Click **Save changes**. @@ -214,7 +214,7 @@ By default, expired SSH keys **are not usable**. To allow the use of expired SSH keys: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Account and limit** section. 1. Uncheck the **Enforce SSH key expiration** checkbox. @@ -230,7 +230,7 @@ By default, expired personal access tokens (PATs) **are not usable**. To allow the use of expired PATs: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Account and limit** section. 1. Uncheck the **Enforce personal access token expiration** checkbox. @@ -243,7 +243,7 @@ To maintain integrity of user details in [Audit Events](../../../administration/ To do this: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**, then expand **Account and limit**. +1. On the left sidebar, select **Settings > General**, then expand **Account and limit**. 1. Select the **Prevent users from changing their profile name** checkbox. NOTE: diff --git a/doc/user/admin_area/settings/external_authorization.md b/doc/user/admin_area/settings/external_authorization.md index eb3f77f6807..985f3c133d5 100644 --- a/doc/user/admin_area/settings/external_authorization.md +++ b/doc/user/admin_area/settings/external_authorization.md @@ -42,7 +42,7 @@ the [Omnibus GitLab documentation](https://docs.gitlab.com/omnibus/settings/logs The external authorization service can be enabled by an administrator: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**: +1. On the left sidebar, select **Settings > General**: ![Enable external authorization service](img/external_authorization_service_settings.png) The available required properties are: diff --git a/doc/user/admin_area/settings/floc.md b/doc/user/admin_area/settings/floc.md index d9a2815bc26..17c390aef0e 100644 --- a/doc/user/admin_area/settings/floc.md +++ b/doc/user/admin_area/settings/floc.md @@ -23,7 +23,7 @@ Permissions-Policy: interest-cohort=() To enable it: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand **Federated Learning of Cohorts**. 1. Check the box. 1. Click **Save changes**. diff --git a/doc/user/admin_area/settings/help_page.md b/doc/user/admin_area/settings/help_page.md index 0912f043712..cf08b9b71db 100644 --- a/doc/user/admin_area/settings/help_page.md +++ b/doc/user/admin_area/settings/help_page.md @@ -85,7 +85,7 @@ You can redirect these `/help` links to either: - A destination that meets [necessary requirements](#destination-requirements). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > Preferences**. +1. On the left sidebar, select **Settings > Preferences**. 1. Expand **Sign-in and Help page**. 1. In the **Documentation pages URL** field, enter the URL. 1. Select **Save changes**. diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md index 18b8833320b..78c1e01c33b 100644 --- a/doc/user/admin_area/settings/index.md +++ b/doc/user/admin_area/settings/index.md @@ -18,7 +18,7 @@ documentation for all current settings and limits on the GitLab.com instance. To access the default page for Admin Area settings: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. | Option | Description | | ------ | ----------- | @@ -127,5 +127,5 @@ You can change the [Default first day of the week](../../profile/preferences.md) for the entire GitLab instance: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > Preferences**. +1. On the left sidebar, select **Settings > Preferences**. 1. Scroll to the **Localization** section, and select your desired first day of the week. diff --git a/doc/user/admin_area/settings/instance_template_repository.md b/doc/user/admin_area/settings/instance_template_repository.md index a63444308b6..862bf3b1652 100644 --- a/doc/user/admin_area/settings/instance_template_repository.md +++ b/doc/user/admin_area/settings/instance_template_repository.md @@ -20,7 +20,7 @@ while the project remains secure. To select a project to serve as the custom template repository: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > Templates**. +1. On the left sidebar, select **Settings > Templates**. 1. Select the project: ![File templates in the Admin Area](img/file_template_admin_area_v14_0.png) diff --git a/doc/user/admin_area/settings/project_integration_management.md b/doc/user/admin_area/settings/project_integration_management.md index 597e6f4d80f..aadabe4d6ad 100644 --- a/doc/user/admin_area/settings/project_integration_management.md +++ b/doc/user/admin_area/settings/project_integration_management.md @@ -23,7 +23,7 @@ Only the complete settings for an integration can be inherited. Per-field inheri > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2543) in GitLab 13.6 for group-level integrations. 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > Integrations**. +1. On the left sidebar, select **Settings > Integrations**. 1. Select an integration. 1. Enter configuration details and click **Save changes**. @@ -55,7 +55,7 @@ integration on all non-configured groups and projects by default. ### Remove an instance-level default setting 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > Integrations**. +1. On the left sidebar, select **Settings > Integrations**. 1. Select an integration. 1. Click **Reset** and confirm. @@ -69,7 +69,7 @@ You can view which projects in your instance use custom settings that [override for an integration. 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > Integrations**. +1. On the left sidebar, select **Settings > Integrations**. 1. Select an integration. 1. Select the **Projects using custom settings** tab. diff --git a/doc/user/admin_area/settings/push_event_activities_limit.md b/doc/user/admin_area/settings/push_event_activities_limit.md index e36339cdaaf..760ce96d987 100644 --- a/doc/user/admin_area/settings/push_event_activities_limit.md +++ b/doc/user/admin_area/settings/push_event_activities_limit.md @@ -27,7 +27,7 @@ To modify this setting: - In the Admin Area: 1. On the top bar, select **Menu > Admin**. - 1. In the left sidebar, select **Settings > Network**, then expand **Performance optimization**. + 1. On the left sidebar, select **Settings > Network**, then expand **Performance optimization**. - Through the [Application settings API](../../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls) as `push_event_activities_limit`. diff --git a/doc/user/admin_area/settings/rate_limits_on_raw_endpoints.md b/doc/user/admin_area/settings/rate_limits_on_raw_endpoints.md index f2d42beca5a..020d02b1635 100644 --- a/doc/user/admin_area/settings/rate_limits_on_raw_endpoints.md +++ b/doc/user/admin_area/settings/rate_limits_on_raw_endpoints.md @@ -12,7 +12,7 @@ type: reference This setting defaults to `300` requests per minute, and allows you to rate limit the requests to raw endpoints: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > Network**. +1. On the left sidebar, select **Settings > Network**. 1. Expand **Performance optimization**. For example, requests over `300` per minute to `https://gitlab.com/gitlab-org/gitlab-foss/raw/master/app/controllers/application_controller.rb` are blocked. Access to the raw file is released after 1 minute. diff --git a/doc/user/admin_area/settings/sign_in_restrictions.md b/doc/user/admin_area/settings/sign_in_restrictions.md index 1037ad25276..223ffeebd44 100644 --- a/doc/user/admin_area/settings/sign_in_restrictions.md +++ b/doc/user/admin_area/settings/sign_in_restrictions.md @@ -14,7 +14,7 @@ You can use **Sign-in restrictions** to customize authentication restrictions fo To access sign-in restriction settings: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Sign-in restrictions** section. ## Password authentication enabled @@ -118,7 +118,7 @@ For example, if you include the following information in the noted text box: To access this text box: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**, and expand the **Sign-in restrictions** section. +1. On the left sidebar, select **Settings > General**, and expand the **Sign-in restrictions** section. ``` Your users see the **Custom sign-in text** when they navigate to the sign-in screen for your diff --git a/doc/user/admin_area/settings/sign_up_restrictions.md b/doc/user/admin_area/settings/sign_up_restrictions.md index cb96b537e3d..62adbfff238 100644 --- a/doc/user/admin_area/settings/sign_up_restrictions.md +++ b/doc/user/admin_area/settings/sign_up_restrictions.md @@ -23,7 +23,7 @@ you do not expect public users to sign up for an account. To disable sign ups: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**, and expand **Sign-up restrictions**. +1. On the left sidebar, select **Settings > General**, and expand **Sign-up restrictions**. 1. Clear the **Sign-up enabled** checkbox, then select **Save changes**. ## Require administrator approval for new sign ups @@ -39,7 +39,7 @@ enabled by default for new GitLab instances. It is only applicable if sign ups a To require administrator approval for new sign ups: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**, and expand **Sign-up restrictions**. +1. On the left sidebar, select **Settings > General**, and expand **Sign-up restrictions**. 1. Select the **Require admin approval for new sign-ups** checkbox, then select **Save changes**. In [GitLab 13.7 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/273258), if an administrator disables this setting, the users in pending approval state are @@ -53,7 +53,7 @@ their email address before they are allowed to sign in. To enforce confirmation of the email address used for new sign ups: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**, and expand **Sign-up restrictions**. +1. On the left sidebar, select **Settings > General**, and expand **Sign-up restrictions**. 1. Select the **Enable email restrictions for sign ups** checkbox, then select **Save changes**. ## User cap **(FREE SELF)** @@ -71,7 +71,7 @@ user cap, the users in pending approval state are automatically approved in a ba ### Set the user cap number 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand **Sign-up restrictions**. 1. Enter a number in **User cap**. 1. Select **Save changes**. @@ -81,7 +81,7 @@ New user sign ups are subject to the user cap restriction. ## Remove the user cap 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand **Sign-up restrictions**. 1. Remove the number from **User cap**. 1. Select **Save changes**. @@ -139,7 +139,7 @@ reduce the risk of malicious users creating spam accounts with disposable email To create an email domain allowlist or denylist: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**, and expand **Sign-up restrictions**. +1. On the left sidebar, select **Settings > General**, and expand **Sign-up restrictions**. 1. For the allowlist, you must enter the list manually. For the denylist, you can enter the list manually or upload a `.txt` file that contains list entries. diff --git a/doc/user/admin_area/settings/terms.md b/doc/user/admin_area/settings/terms.md index dd3cc0a16fb..c7c41e665ec 100644 --- a/doc/user/admin_area/settings/terms.md +++ b/doc/user/admin_area/settings/terms.md @@ -18,7 +18,7 @@ for example `https://gitlab.example.com/-/users/terms`. To enforce acceptance of a Terms of Service and Privacy Policy: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Terms of Service and Privacy Policy** section. 1. Check the **All users must accept the Terms of Service and Privacy Policy to access GitLab** checkbox. 1. Input the text of the **Terms of Service and Privacy Policy**. You can use [Markdown](../../markdown.md) diff --git a/doc/user/admin_area/settings/user_and_ip_rate_limits.md b/doc/user/admin_area/settings/user_and_ip_rate_limits.md index 7e547541079..28c78fd8837 100644 --- a/doc/user/admin_area/settings/user_and_ip_rate_limits.md +++ b/doc/user/admin_area/settings/user_and_ip_rate_limits.md @@ -20,7 +20,7 @@ The following limits are disabled by default: To enforce any or all of them: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > Network**, and expand **User and IP rate limits**: +1. On the left sidebar, select **Settings > Network**, and expand **User and IP rate limits**: ![user-and-ip-rate-limits](img/user_and_ip_rate_limits.png) NOTE: 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 5d7b90ab44f..7f3f4b32802 100644 --- a/doc/user/admin_area/settings/visibility_and_access_controls.md +++ b/doc/user/admin_area/settings/visibility_and_access_controls.md @@ -14,7 +14,7 @@ To access the visibility and access control options: 1. Sign in to GitLab as a user with [Administrator role](../../permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Visibility and access controls** section. ## Protect default branches @@ -34,7 +34,7 @@ To change the default branch protection for the entire instance: 1. Sign in to GitLab as a user with [Administrator role](../../permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Visibility and access controls** section. 1. Select a **Default branch protection**: - **Not protected** - Both developers and maintainers can push new commits, @@ -60,7 +60,7 @@ disable this privilege for group owners, enforcing the instance-level protection 1. Sign in to GitLab as a user with [Administrator role](../../permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Visibility and access controls** section. 1. Deselect the **Allow owners to manage default branch protection per group** checkbox. 1. Select **Save changes**. @@ -76,7 +76,7 @@ on the instance. To alter which roles have permission to create projects: 1. Sign in to GitLab as a user with [Administrator role](../../permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Visibility and access controls** section. 1. For **Default project creation protection**, select the desired roles: - No one. @@ -91,7 +91,7 @@ delete a project. To allow only users with the Administrator role to delete proj 1. Sign in to GitLab as a user with [Administrator role](../../permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Visibility and access controls** section. 1. Scroll to **Default project deletion protection**, and select **Only admins can delete project**. 1. Select **Save changes**. @@ -143,7 +143,7 @@ To set the default [visibility levels for new projects](../../../public_access/p 1. Sign in to GitLab as a user with [Administrator role](../../permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Visibility and access controls** section. 1. Select the desired default project visibility: - **Private** - Project access must be granted explicitly to each user. If this @@ -158,7 +158,7 @@ To set the default visibility levels for new [snippets](../../snippets.md): 1. Sign in to GitLab as a user with [Administrator role](../../permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Visibility and access controls** section. 1. Select the desired default snippet visibility. 1. Select **Save changes**. @@ -172,7 +172,7 @@ To set the default visibility levels for new groups: 1. Sign in to GitLab as a user with [Administrator role](../../permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Visibility and access controls** section. 1. Select the desired default group visibility: - **Private** - The group and its projects can only be viewed by members. @@ -189,7 +189,7 @@ To restrict visibility levels for projects, snippets, and selected pages: 1. Sign in to GitLab as a user with [Administrator role](../../permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Visibility and access controls** section. 1. In the **Restricted visibility levels** section, select the desired visibility levels to restrict. 1. Select **Save changes**. @@ -203,7 +203,7 @@ You can specify from which hosting sites users can [import their projects](../.. 1. Sign in to GitLab as a user with [Administrator role](../../permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Visibility and access controls** section. 1. Select each of **Import sources** to allow. 1. Select **Save changes**. @@ -215,7 +215,7 @@ To enable the export of 1. Sign in to GitLab as a user with [Administrator role](../../permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Visibility and access controls** section. 1. Select **Project export enabled**. 1. Select **Save changes**. @@ -231,7 +231,7 @@ To specify the enabled Git access protocols: 1. Sign in to GitLab as a user with [Administrator role](../../permissions.md). 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Expand the **Visibility and access controls** section. 1. Select the desired Git access protocols: - Both SSH and HTTP(S) diff --git a/doc/user/admin_area/user_cohorts.md b/doc/user/admin_area/user_cohorts.md index ea40d9be2a1..89026e56a27 100644 --- a/doc/user/admin_area/user_cohorts.md +++ b/doc/user/admin_area/user_cohorts.md @@ -11,7 +11,7 @@ You can analyze your users' GitLab activities over time. To view user cohorts: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Overview > Users**. +1. On the left sidebar, select **Overview > Users**. 1. Select the **Cohorts** tab. ## Overview diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index a1d8863710c..7bff0a83532 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -13,7 +13,7 @@ GitLab encourages communication through comments, threads, and There are two types of comments: - A standard comment. -- A comment in a thread, which has to be resolved. +- A comment in a thread, which can be [resolved](#resolve-a-thread). In a comment, you can enter [Markdown](../markdown.md) and use [quick actions](../project/quick_actions.md). @@ -218,16 +218,16 @@ A threaded comment is created. ## Resolve a thread > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5022) in GitLab 8.11. -> - Resolvable threads can be added only to merge request diffs. > - Resolving comments individually was [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/28750) in GitLab 13.6. -You can resolve a thread when you want to finish a conversation. +In a merge request, you can resolve a thread when you want to finish a conversation. Prerequisites: - You must have at least the [Developer role](../permissions.md#project-members-permissions) or be the author of the change being reviewed. -- You must be in an issue, merge request, commit, or snippet. +- Resolvable threads can be added only to merge requests. It doesn't work + for comments in issues, commits, or snippets. To resolve a thread: diff --git a/doc/user/group/index.md b/doc/user/group/index.md index f69aabf4d14..84f23eecc08 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -316,7 +316,7 @@ In GitLab 13.11, you can optionally replace the sharing form with a modal window To share a group after enabling this feature: 1. Go to your group's page. -1. In the left sidebar, go to **Group information > Members**, and then select **Invite a group**. +1. On the left sidebar, go to **Group information > Members**, and then select **Invite a group**. 1. Select a group, and select a **Max role**. 1. (Optional) Select an **Access expiration date**. 1. Select **Invite**. diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md index 18b0cdbbd63..1c6fad73efe 100644 --- a/doc/user/group/saml_sso/index.md +++ b/doc/user/group/saml_sso/index.md @@ -310,7 +310,7 @@ For example, to unlink the `MyOrg` account: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Account**. +1. On the left sidebar, select **Account**. 1. In the **Social sign-in** section, select **Disconnect** next to the connected account. ![Unlink Group SAML](img/unlink_group_saml.png) diff --git a/doc/user/group/settings/import_export.md b/doc/user/group/settings/import_export.md index cacfe0a6f10..516f3504a98 100644 --- a/doc/user/group/settings/import_export.md +++ b/doc/user/group/settings/import_export.md @@ -69,7 +69,7 @@ Users with the [Owner role](../../permissions.md) for a group can export the contents of that group: 1. On the top bar, select **Menu >** **Groups** and find your group. -1. In the left sidebar, select **Settings**. +1. On the left sidebar, select **Settings**. 1. Scroll to the **Advanced** section, and select **Export Group**. 1. After the export is generated, you should receive an email with a link to the [exported contents](#exported-contents) in a compressed tar archive, with contents in NDJSON format. diff --git a/doc/user/instance/clusters/index.md b/doc/user/instance/clusters/index.md index 149ef376dcc..20cd30b6110 100644 --- a/doc/user/instance/clusters/index.md +++ b/doc/user/instance/clusters/index.md @@ -17,7 +17,7 @@ projects. To view the instance level Kubernetes clusters: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Kubernetes**. +1. On the left sidebar, select **Kubernetes**. ## Cluster precedence diff --git a/doc/user/packages/terraform_module_registry/index.md b/doc/user/packages/terraform_module_registry/index.md index 6fc870425a8..7f101adccad 100644 --- a/doc/user/packages/terraform_module_registry/index.md +++ b/doc/user/packages/terraform_module_registry/index.md @@ -41,6 +41,10 @@ PUT /projects/:id/packages/terraform/modules/:module_name/:module_system/:module Provide the file content in the request body. +Note that, in the following example, the request must end with `/file`. +If you send a request ending with something else, it results in a 404 +error `{"error":"404 Not Found"}`. + Example request using a personal access token: ```shell diff --git a/doc/user/profile/account/delete_account.md b/doc/user/profile/account/delete_account.md index 991d035c301..41b4e508c38 100644 --- a/doc/user/profile/account/delete_account.md +++ b/doc/user/profile/account/delete_account.md @@ -21,7 +21,7 @@ As a user, to delete your own account: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Account**. +1. On the left sidebar, select **Account**. 1. Select **Delete account**. ## As an administrator diff --git a/doc/user/profile/active_sessions.md b/doc/user/profile/active_sessions.md index e55b92378bd..25f349d9272 100644 --- a/doc/user/profile/active_sessions.md +++ b/doc/user/profile/active_sessions.md @@ -18,7 +18,7 @@ To list all active sessions: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Active Sessions**. +1. On the left sidebar, select **Active Sessions**. ![Active sessions list](img/active_sessions_list.png) @@ -35,7 +35,7 @@ To revoke an active session: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Active Sessions**. +1. On the left sidebar, select **Active Sessions**. 1. Select **Revoke** next to a session. The current session cannot be revoked, as this would sign you out of GitLab. NOTE: diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md index 38e7c37ddb1..82a56d00118 100644 --- a/doc/user/profile/index.md +++ b/doc/user/profile/index.md @@ -31,7 +31,7 @@ To change your password: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Password**. +1. On the left sidebar, select **Password**. 1. In the **Current password** field, enter your current password. 1. In the **New password** and **Password confirmation** field, enter your new password. 1. Select **Save password**. @@ -55,7 +55,7 @@ To change your username: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Account**. +1. On the left sidebar, select **Account**. 1. In the **Change username** section, enter a new username as the path. 1. Select **Update username**. diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md index cd4d4e370db..ffb1db062b8 100644 --- a/doc/user/profile/notifications.md +++ b/doc/user/profile/notifications.md @@ -48,7 +48,7 @@ To edit your notification settings: 1. In the top-right corner, select your avatar. 1. Select **Preferences**. -1. In the left sidebar, select **Notifications**. +1. On the left sidebar, select **Notifications**. 1. Edit the desired notification settings. Edited settings are automatically saved and enabled. ## Notification scope @@ -90,7 +90,7 @@ To select a notification level for a group, use either of these methods: 1. In the top-right corner, select your avatar. 1. Select **Preferences**. -1. In the left sidebar, select **Notifications**. +1. On the left sidebar, select **Notifications**. 1. Locate the project in the **Groups** section. 1. Select the desired [notification level](#notification-levels). @@ -108,7 +108,7 @@ You can select an email address to receive notifications for each group you belo 1. In the top-right corner, select your avatar. 1. Select **Preferences**. -1. In the left sidebar, select **Notifications**. +1. On the left sidebar, select **Notifications**. 1. Locate the project in the **Groups** section. 1. Select the desired email address. @@ -120,7 +120,7 @@ To select a notification level for a project, use either of these methods: 1. In the top-right corner, select your avatar. 1. Select **Preferences**. -1. In the left sidebar, select **Notifications**. +1. On the left sidebar, select **Notifications**. 1. Locate the project in the **Projects** section. 1. Select the desired [notification level](#notification-levels). diff --git a/doc/user/profile/personal_access_tokens.md b/doc/user/profile/personal_access_tokens.md index ca9460793cf..9bd5153d6d5 100644 --- a/doc/user/profile/personal_access_tokens.md +++ b/doc/user/profile/personal_access_tokens.md @@ -38,7 +38,7 @@ You can create as many personal access tokens as you like. 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Access Tokens**. +1. On the left sidebar, select **Access Tokens**. 1. Enter a name and optional expiry date for the token. 1. Select the [desired scopes](#personal-access-token-scopes). 1. Select **Create personal access token**. @@ -62,7 +62,7 @@ At any time, you can revoke a personal access token. 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Access Tokens**. +1. On the left sidebar, select **Access Tokens**. 1. In the **Active personal access tokens** area, next to the key, select **Revoke**. ## View the last time a token was used @@ -74,7 +74,7 @@ To view the last time a token was used: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **Access Tokens**. +1. On the left sidebar, select **Access Tokens**. 1. In the **Active personal access tokens** area, next to the key, view the **Last Used** date. ## Personal access token scopes diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md index bcf76ad53f6..7033b90b736 100644 --- a/doc/user/project/issues/managing_issues.md +++ b/doc/user/project/issues/managing_issues.md @@ -72,7 +72,7 @@ When you're creating a new issue, these are the fields you can fill in: To visit the issue tracker for all projects in your group: 1. Go to the group dashboard. -1. In the left sidebar, select **Issues**. +1. On the left sidebar, select **Issues**. 1. In the top-right, select the **Select project to create issue** button. 1. Select the project you'd like to create an issue for. The button now reflects the selected project. diff --git a/doc/user/project/members/share_project_with_groups.md b/doc/user/project/members/share_project_with_groups.md index 353ce73329e..e1149b85cd5 100644 --- a/doc/user/project/members/share_project_with_groups.md +++ b/doc/user/project/members/share_project_with_groups.md @@ -59,7 +59,7 @@ In GitLab 13.11, you can optionally replace the sharing form with a modal window To share a project after enabling this feature: 1. Go to your project's page. -1. In the left sidebar, go to **Project information > Members**, and then select **Invite a group**. +1. On the left sidebar, go to **Project information > Members**, and then select **Invite a group**. 1. Select a group, and select a **Max role**. 1. (Optional) Select an **Access expiration date**. 1. Select **Invite**. diff --git a/doc/user/project/pages/pages_access_control.md b/doc/user/project/pages/pages_access_control.md index 532a36b2327..4b4d479e3e9 100644 --- a/doc/user/project/pages/pages_access_control.md +++ b/doc/user/project/pages/pages_access_control.md @@ -52,6 +52,6 @@ To sign out of your GitLab Pages website, revoke the application access token for GitLab Pages: 1. In the top menu, select your profile, and then select **Settings**. -1. In the left sidebar, select **Applications**. +1. On the left sidebar, select **Applications**. 1. Scroll to the **Authorized applications** section, find the **GitLab Pages** entry, and select its **Revoke** button. diff --git a/doc/user/project/repository/branches/default.md b/doc/user/project/repository/branches/default.md index cb920184d65..a1ea929bb49 100644 --- a/doc/user/project/repository/branches/default.md +++ b/doc/user/project/repository/branches/default.md @@ -64,7 +64,7 @@ customize the initial branch for projects hosted on that instance. Individual groups and subgroups can override this instance-wide setting for their projects. 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > Repository**. +1. On the left sidebar, select **Settings > Repository**. 1. Expand **Default initial branch name**. 1. Change the default initial branch to a custom name of your choice. 1. Select **Save changes**. diff --git a/doc/user/project/repository/gpg_signed_commits/index.md b/doc/user/project/repository/gpg_signed_commits/index.md index 91d3a06d7da..23d7aecc960 100644 --- a/doc/user/project/repository/gpg_signed_commits/index.md +++ b/doc/user/project/repository/gpg_signed_commits/index.md @@ -155,7 +155,7 @@ You can add a GPG key in your user settings: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **GPG Keys**. +1. On the left sidebar, select **GPG Keys**. 1. Paste your _public_ key in the **Key** text box. ![Paste GPG public key](img/profile_settings_gpg_keys_paste_pub.png) @@ -253,7 +253,7 @@ To revoke a GPG key: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **GPG Keys**. +1. On the left sidebar, select **GPG Keys**. 1. Select **Revoke** next to the GPG key you want to delete. ## Removing a GPG key @@ -267,7 +267,7 @@ To remove a GPG key from your account: 1. In the top-right corner, select your avatar. 1. Select **Edit profile**. -1. In the left sidebar, select **GPG Keys**. +1. On the left sidebar, select **GPG Keys**. 1. Select the trash icon (**{remove}**) next to the GPG key you want to delete. ## Rejecting commits that are not signed **(PREMIUM)** diff --git a/doc/user/project/repository/repository_mirroring.md b/doc/user/project/repository/repository_mirroring.md index 6e5fbdd140a..5a02a35fce1 100644 --- a/doc/user/project/repository/repository_mirroring.md +++ b/doc/user/project/repository/repository_mirroring.md @@ -613,7 +613,7 @@ If you receive this error after creating a new project using Check if the repository owner is specified in the URL of your mirrored repository: 1. Go to your project. -1. In the left sidebar, select **Settings > Repository**. +1. On the left sidebar, select **Settings > Repository**. 1. Select **Mirroring repositories**. 1. If no repository owner is specified, delete and add the URL again in this format: diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md index c5ce9364f0e..010a63b7957 100644 --- a/doc/user/project/web_ide/index.md +++ b/doc/user/project/web_ide/index.md @@ -294,7 +294,7 @@ Live Preview is enabled for all projects on GitLab.com. If you are an administra of a self-managed GitLab instance, and you want to enable Live Preview: 1. On the top bar, select **Menu > Admin**. -1. In the left sidebar, select **Settings > General**. +1. On the left sidebar, select **Settings > General**. 1. Scroll to **Web IDE** and select **Expand**: ![Administrator Live Preview setting](img/admin_live_preview_v13_0.png) 1. Select **Enable Live Preview** and select **Save changes**. -- cgit v1.2.3