Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2022-03-06 21:17:22 +00:00
parent 12ca592763
commit d074e68dd1
9 changed files with 12 additions and 9 deletions

View File

@ -14,6 +14,8 @@ swap:
click: select
code base: codebase
config: configuration
deselect: clear
deselected: cleared
distro: distribution
file name: filename
filesystem: file system

View File

@ -174,8 +174,7 @@ See also [contractions](index.md#contractions).
Use one word for **checkbox**. Do not use **check box**.
You **select** (not **check** or **enable**) and **clear** (not **deselect** or **disable**) checkboxes.
For example:
You **select** (not **check** or **enable**) and **clear** (not **deselect** or **disable**) checkboxes. For example:
- Select the **Protect environment** checkbox.
- Clear the **Protect environment** checkbox.
@ -185,6 +184,8 @@ If you must refer to the checkbox, you can say it is selected or cleared. For ex
- Ensure the **Protect environment** checkbox is cleared.
- Ensure the **Protect environment** checkbox is selected.
(For `deselect`, [Vale](../testing.md#vale) rule: [`SubstitutionWarning.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/SubstitutionWarning.yml))
## checkout, check out
Use **check out** as a verb. For the Git command, use `checkout`.

View File

@ -196,7 +196,7 @@ To assign an alert:
After completing their portion of investigating or fixing the alert, users can
unassign themselves from the alert. To remove an assignee, select **Edit** next to the **Assignee** dropdown menu
and deselect the user from the list of assignees, or select **Unassigned**.
and clear the user from the list of assignees, or select **Unassigned**.
### Create a to-do item from an alert

View File

@ -226,7 +226,7 @@ There are different actions available to help triage and respond to incidents.
### Assign incidents
Assign incidents to users that are actively responding. Select **Edit** in the
right-hand side bar to select or deselect assignees.
right-hand side bar to select or clear assignees.
### Associate a milestone

View File

@ -59,7 +59,7 @@ disable this privilege for group owners, enforcing the instance-level protection
1. On the top bar, select **Menu > Admin**.
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. Clear the **Allow owners to manage default branch protection per group** checkbox.
1. Select **Save changes**.
NOTE:

View File

@ -143,6 +143,6 @@ Reasons for failure include:
NOTE:
Project-level clusters upgraded from GitLab 12.0 or older may be configured
in a way that causes this error. Ensure you deselect the
in a way that causes this error. Ensure you clear the
[GitLab-managed cluster](gitlab_managed_clusters.md) option if you want to manage
namespaces and service accounts yourself.

View File

@ -39,4 +39,4 @@ to assign the issue to.
![adding multiple assignees](img/multiple_assignees.gif)
To remove an assignee, deselect them from the same dropdown menu.
To remove an assignee, clear them from the same dropdown menu.

View File

@ -161,7 +161,7 @@ enabled by default for all new merge requests, enable it in the
[project's settings](../settings/index.md#merge-request-settings).
This option is also visible in an existing merge request next to
the merge request button and can be selected or deselected before merging.
the merge request button and can be selected or cleared before merging.
It is only visible to users with the Maintainer role
in the source project.

View File

@ -65,7 +65,7 @@ To configure the default squashing behavior for all merge requests in your proje
1. Expand **Merge requests**.
1. In the **Squash commits when merging** section, select your desired behavior:
- **Do not allow**: Squashing is never performed, and the option is not displayed.
- **Allow**: Squashing is allowed, but deselected by default.
- **Allow**: Squashing is allowed, but cleared by default.
- **Encourage**: Squashing is allowed and selected by default, but can be disabled.
- **Require**: Squashing is always performed. While merge requests display the option
to squash, users cannot change it.