Add latest changes from gitlab-org/gitlab@master

17 files changed, 38 insertions, 21 deletions

diff --git a/doc/user/admin_area/settings/img/domain_denylist.png b/doc/user/admin_area/settings/img/domain_denylist.png
deleted file mode 100644
index a7e972b7c0a..00000000000
--- a/doc/user/admin_area/settings/img/domain_denylist.png
+++ /dev/null
diff --git a/doc/user/admin_area/settings/img/domain_denylist_v14_1.png b/doc/user/admin_area/settings/img/domain_denylist_v14_1.png
new file mode 100644
index 00000000000..c988afd75f6
--- /dev/null
+++ b/doc/user/admin_area/settings/img/domain_denylist_v14_1.png
diff --git a/doc/user/admin_area/settings/sign_up_restrictions.md b/doc/user/admin_area/settings/sign_up_restrictions.md
index 23b560da1d2..c774ae2eecc 100644
--- a/doc/user/admin_area/settings/sign_up_restrictions.md
+++ b/doc/user/admin_area/settings/sign_up_restrictions.md
@@ -148,7 +148,7 @@ To create an email domain allowlist or denylist:
 domains ending in `.io`. Domains must be separated by a whitespace,
 semicolon, comma, or a new line.
 
-   ![Domain Denylist](img/domain_denylist.png)
+   ![Domain Denylist](img/domain_denylist_v14_1.png)
 
 ### Enable or disable soft email confirmation
 
diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md
index c64df616925..df76ec35a26 100644
--- a/doc/user/application_security/sast/index.md
+++ b/doc/user/application_security/sast/index.md
@@ -31,8 +31,8 @@ The results are sorted by the priority of the vulnerability:
 1. High
 1. Medium
 1. Low
+1. Info
 1. Unknown
-1. Everything else
 
 A pipeline consists of multiple jobs, including SAST and DAST scanning. If any job fails to finish
 for any reason, the security dashboard does not show SAST scanner output. For example, if the SAST
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md
index cb7c4d36240..024ab86a1b7 100644
--- a/doc/user/gitlab_com/index.md
+++ b/doc/user/gitlab_com/index.md
@@ -67,6 +67,13 @@ Similarly, you can clone a project's wiki to back it up. All files
 [uploaded after August 22, 2020](../project/wiki/index.md#create-a-new-wiki-page)
 are included when cloning.
 
+## Delayed project deletion **(PREMIUM SAAS)**
+
+Top-level groups created after August 12, 2021 have delayed project deletion enabled by default.
+Projects are permanently deleted after a seven-day delay.
+
+You can disable this by changing the [group setting](../group/index.md#enable-delayed-project-removal).
+
 ## Alternative SSH port
 
 GitLab.com can be reached by using a [different SSH port](https://about.gitlab.com/blog/2016/02/18/gitlab-dot-com-now-supports-an-alternate-git-plus-ssh-port/) for `git+ssh`.
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index 034a2605c01..123b64146d8 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -659,15 +659,24 @@ To disable group mentions:
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) in GitLab 13.2.
 > - [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.
 
-By default, projects in a group are deleted immediately.
-Optionally, on [Premium](https://about.gitlab.com/pricing/) or higher tiers,
-you can configure the projects in a group to be deleted after a delayed interval.
+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, if required. The default interval period is seven days but
+  [is configurable](../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay).
+
+On:
 
-During this interval period, the projects are in a read-only state and can be restored, if required.
-The interval period defaults to 7 days, and can be modified by an administrator in the [instance settings](../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay).
+- GitLab self-managed instances, projects are deleted immediately by default. In GitLab
+  14.2 and later, an administrator can
+  [change the default setting](../admin_area/settings/visibility_and_access_controls.md#default-delayed-project-deletion) for projects in newly-created groups.
+- GitLab.com, see [GitLab.com settings page](../gitlab_com/index.md#delayed-project-deletion) for
+  the default setting.
 
-To enable delayed deletion of projects:
+To enable delayed deletion of projects in a group:
 
 1. Go to the group's **Settings > General** page.
 1. Expand the **Permissions, LFS, 2FA** section.
diff --git a/doc/user/group/saml_sso/scim_setup.md b/doc/user/group/saml_sso/scim_setup.md
index fd75c49fa6c..a0c281971fc 100644
--- a/doc/user/group/saml_sso/scim_setup.md
+++ b/doc/user/group/saml_sso/scim_setup.md
@@ -121,7 +121,7 @@ configuration. Otherwise, the Okta SCIM app may not work properly.
 1. In the **Application** tab, click **Add Application**.
 1. Search for **GitLab**, find and click on the 'GitLab' application.
 1. On the GitLab application overview page, click **Add**.
-1. Under **Application Visibility** select both check boxes. Currently the GitLab application does not support SAML authentication so the icon should not be shown to users.
+1. Under **Application Visibility** select both checkboxes. Currently the GitLab application does not support SAML authentication so the icon should not be shown to users.
 1. Click **Done** to finish adding the application.
 1. In the **Provisioning** tab, click **Configure API integration**.
 1. Select **Enable API integration**.
diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md
index 42ba973f31f..0a0411dc925 100644
--- a/doc/user/profile/notifications.md
+++ b/doc/user/profile/notifications.md
@@ -56,11 +56,11 @@ Your **Global notification settings** are the default settings unless you select
 different values for a project or a group.
 
 - **Notification email**: the email address your notifications are sent to.
-- **Receive product marketing emails**: select this check box to receive
+- **Receive product marketing emails**: select this checkbox to receive
   [periodic emails](#product-marketing-emails) about GitLab features.
 - **Global notification level**: the default [notification level](#notification-levels)
   which applies to all your notifications.
-- **Receive notifications about your own activity**: select this check box to receive
+- **Receive notifications about your own activity**: select this checkbox to receive
   notifications about your own activity. Not selected by default.
 
 ![notification settings](img/notification_global_settings_v13_12.png)
diff --git a/doc/user/project/integrations/mattermost_slash_commands.md b/doc/user/project/integrations/mattermost_slash_commands.md
index 7ed94fb53d8..5b5feb73b69 100644
--- a/doc/user/project/integrations/mattermost_slash_commands.md
+++ b/doc/user/project/integrations/mattermost_slash_commands.md
@@ -110,7 +110,7 @@ provide to GitLab:
 
 1. In the GitLab browser tab from
    [getting configuration values from GitLab](#get-configuration-values-from-gitlab),
-   select the **Active** check box to enable this configuration.
+   select the **Active** checkbox to enable this configuration.
 1. In the **Token** field, paste the token you obtained from Mattermost.
    ensure that the **Active** toggle is enabled.
 
diff --git a/doc/user/project/integrations/microsoft_teams.md b/doc/user/project/integrations/microsoft_teams.md
index 192fe8c92ba..fac26f8e70c 100644
--- a/doc/user/project/integrations/microsoft_teams.md
+++ b/doc/user/project/integrations/microsoft_teams.md
@@ -38,7 +38,7 @@ GitLab to send the notifications:
    to your project's page.
 1. Go to **Settings > Integrations** and select **Microsoft Teams Notification**.
 1. Select **Active** to enable the integration.
-1. Select the check box next to each **Trigger** to enable:
+1. Select the checkbox next to each **Trigger** to enable:
    - Push
    - Issue
    - Confidential issue
@@ -51,7 +51,7 @@ GitLab to send the notifications:
 1. In **Webhook**, paste the URL you copied when you
    [configured Microsoft Teams](#configure-microsoft-teams).
 1. (Optional) If you enabled the pipeline trigger, you can select the
-   **Notify only broken pipelines** check box to push notifications only when pipelines break.
+   **Notify only broken pipelines** checkbox to push notifications only when pipelines break.
 1. Select the branches you want to send notifications for.
 1. Click **Save changes**.
 
diff --git a/doc/user/project/merge_requests/squash_and_merge.md b/doc/user/project/merge_requests/squash_and_merge.md
index 47c7e208f2d..2842c084bc5 100644
--- a/doc/user/project/merge_requests/squash_and_merge.md
+++ b/doc/user/project/merge_requests/squash_and_merge.md
@@ -61,7 +61,7 @@ meaningful commit messages and:
 ## Enabling squash for a merge request
 
 Anyone who can create or edit a merge request can choose for it to be squashed
-on the merge request form. Users can select or clear the check box when they
+on the merge request form. Users can select or clear the checkbox when they
 create the merge request:
 
 ![Squash commits checkbox on edit form](img/squash_edit_form.png)
diff --git a/doc/user/project/releases/index.md b/doc/user/project/releases/index.md
index 1070fabf526..76b300bdd57 100644
--- a/doc/user/project/releases/index.md
+++ b/doc/user/project/releases/index.md
@@ -181,7 +181,7 @@ To subscribe to notifications for releases:
 1. On the left sidebar, select **Project information**.
 1. Click **Notification setting** (the bell icon).
 1. In the list, click **Custom**.
-1. Select the **New release** check box.
+1. Select the **New release** checkbox.
 1. Close the dialog box to save.
 
 ## Prevent unintentional releases by setting a deploy freeze
diff --git a/doc/user/project/repository/branches/default.md b/doc/user/project/repository/branches/default.md
index 2b8a47b7ce2..12fd7389f21 100644
--- a/doc/user/project/repository/branches/default.md
+++ b/doc/user/project/repository/branches/default.md
@@ -40,7 +40,7 @@ To update the default branch name for an individual [project](../../index.md):
 1. Sign in to GitLab as a user with the [Administrator](../../../permissions.md) role.
 1. In the left navigation menu, go to **Settings > Repository**.
 1. Expand **Default branch**, and select a new default branch.
-1. (Optional) Select the **Auto-close referenced issues on default branch** check box to close
+1. (Optional) Select the **Auto-close referenced issues on default branch** checkbox to close
    issues when a merge request
    [uses a closing pattern](../../issues/managing_issues.md#closing-issues-automatically).
 1. Select **Save changes**.
diff --git a/doc/user/project/repository/repository_mirroring.md b/doc/user/project/repository/repository_mirroring.md
index 8d259983bd8..76eae58b431 100644
--- a/doc/user/project/repository/repository_mirroring.md
+++ b/doc/user/project/repository/repository_mirroring.md
@@ -62,8 +62,8 @@ For an existing project, you can set up push mirroring as follows:
 1. In the **Mirror direction** dropdown, select **Push**.
 1. Select an authentication method from the **Authentication method** dropdown.
    You can authenticate with either a password or an [SSH key](#ssh-authentication).
-1. Select the **Only mirror protected branches** check box, if necessary.
-1. Select the **Keep divergent refs** check box, if desired.
+1. Select the **Only mirror protected branches** checkbox, if necessary.
+1. Select the **Keep divergent refs** checkbox, if desired.
 1. Select **Mirror repository** to save the configuration.
 
 When push mirroring is enabled, only push commits directly to the mirrored repository to prevent the
diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md
index 2345e0137a2..8074f311e5f 100644
--- a/doc/user/project/repository/web_editor.md
+++ b/doc/user/project/repository/web_editor.md
@@ -214,7 +214,7 @@ When creating or uploading a new file or creating a new directory, you can
 trigger a new merge request rather than committing directly to your default branch:
 
 1. Enter a new branch name in the **Target branch** field.
-1. GitLab displays the **Start a new merge request with these changes** check box.
+1. GitLab displays the **Start a new merge request with these changes** checkbox.
 1. Commit your changes, and GitLab redirects you to a new merge request form.
 
    ![Start a new merge request with these changes](img/web_editor_start_new_merge_request.png)
diff --git a/doc/user/project/requirements/index.md b/doc/user/project/requirements/index.md
index 4ac1113152c..14902fd0cf3 100644
--- a/doc/user/project/requirements/index.md
+++ b/doc/user/project/requirements/index.md
@@ -68,7 +68,7 @@ To edit a requirement:
 
 1. From the requirements list, select the **Edit** icon (**{pencil}**).
 1. Update the title and description in text input field. You can also mark a
-   requirement as satisfied in the edit form by using the check box **Satisfied**.
+   requirement as satisfied in the edit form by using the checkbox **Satisfied**.
 1. Select **Save changes**.
 
 ## Archive a requirement
diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md
index e2c9d8d41ab..179fa755918 100644
--- a/doc/user/project/settings/index.md
+++ b/doc/user/project/settings/index.md
@@ -142,6 +142,7 @@ audit trail:
 include: # Execute individual project's configuration
   project: '$CI_PROJECT_PATH'
   file: '$CI_CONFIG_PATH'
+  ref: '$CI_COMMIT_REF_NAME' # Must be defined or MR pipelines always use the use default branch.
 ```
 
 ##### Ensure compliance jobs are always run