Add latest changes from gitlab-org/gitlab@master

20 files changed, 49 insertions, 31 deletions

diff --git a/doc/user/admin_area/analytics/dev_ops_report.md b/doc/user/admin_area/analytics/dev_ops_report.md
index 02e4760a487..75b99afa526 100644
--- a/doc/user/admin_area/analytics/dev_ops_report.md
+++ b/doc/user/admin_area/analytics/dev_ops_report.md
@@ -50,8 +50,8 @@ The DevOps Adoption tab shows you which segments of your organization are using
 - Deploys
 - Scanning
 
-Segments are arbitrary collections of GitLab groups that you define. You might define a segment to represent a small team, a large department, or a whole organization. 
-You are limited to creating a maximum of 20 segments, and each segment is limited to a maximum of 20 groups. 
+Segments are arbitrary collections of GitLab groups that you define. You might define a segment to represent a small team, a large department, or a whole organization.
+You are limited to creating a maximum of 20 segments, and each segment is limited to a maximum of 20 groups.
 Buttons to manage your segments appear in the DevOps Adoption section of the page.
 
 DevOps Adoption allows you to:
diff --git a/doc/user/admin_area/settings/project_integration_management.md b/doc/user/admin_area/settings/project_integration_management.md
index fe4e84b98ac..adb192f5b4a 100644
--- a/doc/user/admin_area/settings/project_integration_management.md
+++ b/doc/user/admin_area/settings/project_integration_management.md
@@ -51,6 +51,14 @@ is [planned](https://gitlab.com/groups/gitlab-org/-/epics/2137). This would allo
 administrators to update settings inherited by groups and projects without enabling the
 integration on all non-configured groups and projects by default.
 
+### Remove an instance-level default setting
+
+1. Navigate to **Admin Area > Settings > Integrations**.
+1. Select an integration.
+1. Click **Reset** and confirm.
+
+Resetting an instance-level default setting removes the integration from all projects that have the integration set to use default settings.
+
 ## Manage group-level default settings for a project integration
 
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2543) in GitLab 13.6.
@@ -86,6 +94,14 @@ is [planned](https://gitlab.com/groups/gitlab-org/-/epics/2137). This would allo
 administrators to update settings inherited by subgroups and projects without enabling the
 integration on all non-configured groups and projects by default.
 
+### Remove a group-level default setting
+
+1. Navigate to the group's **Settings > Integrations**.
+1. Select an integration.
+1. Click **Reset** and confirm.
+
+Resetting a group-level default setting removes integrations that use default settings and belong to a project or subgroup of the group.
+
 ## Use instance-level or group-level default settings for a project integration
 
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2543) in GitLab 13.6 for group-level settings.
diff --git a/doc/user/application_security/coverage_fuzzing/index.md b/doc/user/application_security/coverage_fuzzing/index.md
index 0a5a0c3a565..2eefc1bffc1 100644
--- a/doc/user/application_security/coverage_fuzzing/index.md
+++ b/doc/user/application_security/coverage_fuzzing/index.md
@@ -31,6 +31,8 @@ Docker image with the fuzz engine to run your app.
 | Rust     | [cargo-fuzz (libFuzzer support)](https://github.com/rust-fuzz/cargo-fuzz) | [rust-fuzzing-example](https://gitlab.com/gitlab-org/security-products/demos/coverage-fuzzing/rust-fuzzing-example) |
 | Java     | [JQF](https://github.com/rohanpadhye/JQF) | [java-fuzzing-example](https://gitlab.com/gitlab-org/security-products/demos/coverage-fuzzing/java-fuzzing-example) |
 | Java     | [javafuzz](https://gitlab.com/gitlab-org/security-products/analyzers/fuzzers/javafuzz) (recommended) | [javafuzz-fuzzing-example](https://gitlab.com/gitlab-org/security-products/demos/coverage-fuzzing/javafuzz-fuzzing-example) |
+| JavaScript | [jsfuzz](https://gitlab.com/gitlab-org/security-products/analyzers/fuzzers/jsfuzz)| [jsfuzz-fuzzing-example](https://gitlab.com/gitlab-org/security-products/demos/coverage-fuzzing/jsfuzz-fuzzing-example) |
+| Python | [pythonfuzz](https://gitlab.com/gitlab-org/security-products/analyzers/fuzzers/pythonfuzz)| [pythonfuzz-fuzzing-example](https://gitlab.com/gitlab-org/security-products/demos/coverage-fuzzing/pythonfuzz-fuzzing-example) |
 
 ## Configuration
 
diff --git a/doc/user/application_security/security_dashboard/img/vulnerability_details_create_issue_v13_7.png b/doc/user/application_security/security_dashboard/img/vulnerability_details_create_issue_v13_7.png
index b9b228c9430..5184ad85fa9 100644
--- a/doc/user/application_security/security_dashboard/img/vulnerability_details_create_issue_v13_7.png
+++ b/doc/user/application_security/security_dashboard/img/vulnerability_details_create_issue_v13_7.png
diff --git a/doc/user/application_security/security_dashboard/index.md b/doc/user/application_security/security_dashboard/index.md
index a4e430ee8b6..10bf6202a92 100644
--- a/doc/user/application_security/security_dashboard/index.md
+++ b/doc/user/application_security/security_dashboard/index.md
@@ -92,7 +92,7 @@ the **Failed jobs** tab of the pipeline page.
 
 The Vulnerability Report next displays the total number of vulnerabilities by severity (for example,
 Critical, High, Medium, Low, Info, Unknown). Below this, a table shows each vulnerability's status, severity,
-description and if there is a Merge Request related to it. Clicking a vulnerability takes you to its 
+description and if there is a Merge Request related to it. Clicking a vulnerability takes you to its
 [Vulnerability Details](../vulnerabilities)
 page to view more information about that vulnerability.
 
diff --git a/doc/user/group/subgroups/img/group_members_filter_v12_6.png b/doc/user/group/subgroups/img/group_members_filter_v12_6.png
deleted file mode 100644
index 692fdfe00a1..00000000000
--- a/doc/user/group/subgroups/img/group_members_filter_v12_6.png
+++ /dev/null
diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md
index 8af075fc0c0..59812fc2b2f 100644
--- a/doc/user/group/subgroups/index.md
+++ b/doc/user/group/subgroups/index.md
@@ -117,7 +117,7 @@ Follow the same process to create any subsequent groups.
 ## Membership
 
 When you add a member to a group, that member is also added to all subgroups.
-Permission level is inherited from the group’s parent. This model allows access to 
+Permission level is inherited from the group’s parent. This model allows access to
 subgroups if you have membership in one of its parents.
 
 Jobs for pipelines in subgroups can use [runners](../../../ci/runners/README.md) registered to the parent group(s).
diff --git a/doc/user/infrastructure/img/terraform_list_view_v13_5.png b/doc/user/infrastructure/img/terraform_list_view_v13_5.png
deleted file mode 100644
index b23dfa6289e..00000000000
--- a/doc/user/infrastructure/img/terraform_list_view_v13_5.png
+++ /dev/null
diff --git a/doc/user/packages/composer_repository/index.md b/doc/user/packages/composer_repository/index.md
index 092c12938e7..5e60f919efd 100644
--- a/doc/user/packages/composer_repository/index.md
+++ b/doc/user/packages/composer_repository/index.md
@@ -77,8 +77,8 @@ Prerequisites:
 
 - A package in a GitLab repository. Composer packages should be versioned based on
   the [Composer specification](https://getcomposer.org/doc/04-schema.md#version).
-  If the version is not valid, for example, it has three dots (`1.0.0.0`), an 
-  error (`Validation failed: Version is invalid`) occurs when you publish. 
+  If the version is not valid, for example, it has three dots (`1.0.0.0`), an
+  error (`Validation failed: Version is invalid`) occurs when you publish.
 - A valid `composer.json` file.
 - The Packages feature is enabled in a GitLab repository.
 - The project ID, which is on the project's home page.
diff --git a/doc/user/packages/conan_repository/index.md b/doc/user/packages/conan_repository/index.md
index 2068338c878..f90c220a622 100644
--- a/doc/user/packages/conan_repository/index.md
+++ b/doc/user/packages/conan_repository/index.md
@@ -396,7 +396,7 @@ When you attempt to install a Conan package, you might receive a `404` error
 like `ERROR: <package> was not found in remote <remote>`.
 
 This issue occurs when you request a download from the project-level Conan API.
-The resulting URL is missing is project's `/<id>` and Conan commands, like 
+The resulting URL is missing is project's `/<id>` and Conan commands, like
 `conan install`, fail.
 
 For more information, see [issue 270129](https://gitlab.com/gitlab-org/gitlab/-/issues/270129).
diff --git a/doc/user/packages/nuget_repository/index.md b/doc/user/packages/nuget_repository/index.md
index 1684974809b..50837e69e74 100644
--- a/doc/user/packages/nuget_repository/index.md
+++ b/doc/user/packages/nuget_repository/index.md
@@ -72,7 +72,7 @@ To use the GitLab endpoint for NuGet Packages, choose an option:
 Some features such as [publishing](#publish-a-nuget-package) a package are only available on the project-level endpoint.
 
 WARNING:
-Because of how NuGet handles credentials, the Package Registry rejects anonymous requests on the group-level endpoint. 
+Because of how NuGet handles credentials, the Package Registry rejects anonymous requests on the group-level endpoint.
 To work around this limitation, set up [authentication](#add-the-package-registry-as-a-source-for-nuget-packages).
 
 ## Add the Package Registry as a source for NuGet packages
@@ -90,7 +90,7 @@ Prerequisites:
     with the scope set to `read_package_registry`, `write_package_registry`, or
     both.
 - A name for your source.
-- Depending on the [endpoint level](#use-the-gitlab-endpoint-for-nuget-packages) you use, either: 
+- Depending on the [endpoint level](#use-the-gitlab-endpoint-for-nuget-packages) you use, either:
   - Your project ID, which is found on your project's home page.
   - Your group ID, which is found on your group's home page.
 
diff --git a/doc/user/packages/workflows/project_registry.md b/doc/user/packages/workflows/project_registry.md
index aea1238b9da..d20c75e2d7a 100644
--- a/doc/user/packages/workflows/project_registry.md
+++ b/doc/user/packages/workflows/project_registry.md
@@ -68,7 +68,7 @@ For Conan, you need to add GitLab as a Conan registry remote. Follow the instruc
 Then, create your package using the plus-separated (`+`) project path as your Conan user. For example,
 if your project is located at `https://gitlab.com/foo/bar/my-proj`,
 [create your Conan package](../conan_repository/index.md) using `conan create . foo+bar+my-proj/channel`.
-`channel` is your package channel (such as `stable` or `beta`). 
+`channel` is your package channel (such as `stable` or `beta`).
 
 After you create your package, you're ready to [publish your package](../conan_repository/index.md#publish-a-conan-package),
 depending on your final package recipe. For example:
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index 0a103c91e03..6cdd2d6f161 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -245,7 +245,7 @@ Search for `security.webauth.u2f` and double click on it to toggle to `true`.
 
 To set up 2FA with a U2F device:
 
-1. Log in to your GitLab account.
+1. Sign in to your GitLab account.
 1. Go to your [**Profile settings**](../index.md#profile-settings).
 1. Go to **Account**.
 1. Click **Enable Two-Factor Authentication**.
@@ -298,11 +298,11 @@ NOTE:
 Recovery codes are not generated for U2F / WebAuthn devices.
 
 WARNING:
-Each code can be used only once to log in to your account.
+Each code can be used only once to sign in to your account.
 
 Immediately after successfully enabling two-factor authentication, you're
 prompted to download a set of generated recovery codes. Should you ever lose access
-to your one-time password authenticator, you can use one of these recovery codes to log in to
+to your one-time password authenticator, you can use one of these recovery codes to sign in to
 your account. We suggest copying and printing them, or downloading them using
 the **Download codes** button for storage in a safe place. If you choose to
 download them, the file is called `gitlab-recovery-codes.txt`.
@@ -314,41 +314,41 @@ If you lose the recovery codes or just want to generate new ones, you can do so
 from the [two-factor authentication account settings page](#regenerate-2fa-recovery-codes) or
 [using SSH](#generate-new-recovery-codes-using-ssh).
 
-## Logging in with 2FA Enabled
+## Signing in with 2FA Enabled
 
-Logging in with 2FA enabled is only slightly different than a normal login.
+Signing in with 2FA enabled is only slightly different than the normal sign-in process.
 Enter your username and password credentials as you normally would, and you're
 presented with a second prompt, depending on which type of 2FA you've enabled.
 
-### Log in via a one-time password
+### Sign in by using a one-time password
 
 When asked, enter the pin from your one time password authenticator's application or a
-recovery code to log in.
+recovery code to sign in.
 
-### Log in via U2F device
+### Sign in by using a U2F device
 
-To log in via a U2F device:
+To sign in by using a U2F device:
 
 1. Click **Login via U2F Device**.
 1. A light begins blinking on your device. Activate it by touching/pressing
    its button.
 
 A message displays, indicating that your device responded to the authentication
-request, and you're automatically logged in.
+request, and you're automatically signed in.
 
-### Log in via WebAuthn device
+### Sign in by using a WebAuthn device
 
 In supported browsers you should be automatically prompted to activate your WebAuthn device
 (e.g. by touching/pressing its button) after entering your credentials.
 
 A message displays, indicating that your device responded to the authentication
-request and you're automatically logged in.
+request and you're automatically signed in.
 
 ## Disabling 2FA
 
 If you ever need to disable 2FA:
 
-1. Log in to your GitLab account.
+1. Sign in to your GitLab account.
 1. Go to your [**Profile settings**](../index.md#profile-settings).
 1. Go to **Account**.
 1. Click **Disable**, under **Two-Factor Authentication**.
@@ -398,7 +398,7 @@ a new set of recovery codes with SSH:
    ```shell
    ssh git@gitlab.com 2fa_recovery_codes
    ```
-   
+
    NOTE:
    On self-managed instances, replace **`gitlab.com`** in the command above
    with the GitLab server hostname (`gitlab.example.com`).
@@ -472,9 +472,9 @@ Sign in and re-enable two-factor authentication as soon as possible.
 
   For example, if a user is trying to access a GitLab instance from `first.host.xyz` and `second.host.xyz`:
 
-  - The user logs in via `first.host.xyz` and registers their U2F key.
-  - The user logs out and attempts to log in via `first.host.xyz` - U2F authentication succeeds.
-  - The user logs out and attempts to log in via `second.host.xyz` - U2F authentication fails, because
+  - The user signs in by using `first.host.xyz` and registers their U2F key.
+  - The user signs out and attempts to sign in by using `first.host.xyz` - U2F authentication succeeds.
+  - The user signs out and attempts to sign in by using `second.host.xyz` - U2F authentication fails, because
     the U2F key has only been registered on `first.host.xyz`.
 
 - To enforce 2FA at the system or group levels see [Enforce Two-factor Authentication](../../../security/two_factor_authentication.md).
diff --git a/doc/user/project/deploy_tokens/img/deploy_tokens_ui.png b/doc/user/project/deploy_tokens/img/deploy_tokens_ui.png
index 83f59b8f6f0..4ab6a45aee1 100644
--- a/doc/user/project/deploy_tokens/img/deploy_tokens_ui.png
+++ b/doc/user/project/deploy_tokens/img/deploy_tokens_ui.png
diff --git a/doc/user/project/description_templates.md b/doc/user/project/description_templates.md
index db2631f9596..3108bdda7a0 100644
--- a/doc/user/project/description_templates.md
+++ b/doc/user/project/description_templates.md
@@ -108,7 +108,7 @@ you should be fine.
 ![Default issue description templates](img/description_templates_issue_settings.png)
 
 After you add the description, hit **Save changes** for the settings to take
-effect. Now, every time a new merge request or issue is created, it is 
+effect. Now, every time a new merge request or issue is created, it is
 pre-filled with the text you entered in the template(s).
 
 ## Description template example
diff --git a/doc/user/project/img/canary_weight.png b/doc/user/project/img/canary_weight.png
index e6544358c15..fe17c62bdea 100644
--- a/doc/user/project/img/canary_weight.png
+++ b/doc/user/project/img/canary_weight.png
diff --git a/doc/user/project/img/protected_branches_deploy_keys_v13_5.png b/doc/user/project/img/protected_branches_deploy_keys_v13_5.png
index 6eda7a671b2..ccd23dbe160 100644
--- a/doc/user/project/img/protected_branches_deploy_keys_v13_5.png
+++ b/doc/user/project/img/protected_branches_deploy_keys_v13_5.png
diff --git a/doc/user/project/issues/confidential_issues.md b/doc/user/project/issues/confidential_issues.md
index 3b3d594ddda..d4fbc4fb10b 100644
--- a/doc/user/project/issues/confidential_issues.md
+++ b/doc/user/project/issues/confidential_issues.md
@@ -103,7 +103,7 @@ for private forks created in the same group or in a sub-group of the original
 Permissions are inherited from parent groups. When private forks are created
 in the same group or sub-group as the original upstream repository, users
 receive the same permissions in both projects. This inheritance ensures
-Developer users have the needed permissions to both view confidential issues and 
+Developer users have the needed permissions to both view confidential issues and
 resolve them.
 
 ### How it works
diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md
index fab41457232..bc9daf67626 100644
--- a/doc/user/project/service_desk.md
+++ b/doc/user/project/service_desk.md
@@ -137,7 +137,7 @@ To edit the custom email display name:
 1. Enter a new name in **Email display name**.
 1. Select **Save Changes**.
 
-### Using custom email address 
+### Using custom email address
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/2201) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.0.
 > - It was [deployed behind a feature flag](../feature_flags.md), disabled by default.
diff --git a/doc/user/todos.md b/doc/user/todos.md
index 7d5a66a1632..27a849719c5 100644
--- a/doc/user/todos.md
+++ b/doc/user/todos.md
@@ -72,7 +72,7 @@ prevent data loss, in the case where a user's access is accidentally revoked.
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7926) in GitLab 9.0.
 
-If you're mentioned at the start of a line, the to-do item you receive is 
+If you're mentioned at the start of a line, the to-do item you receive is
 listed as *directly addressed*. For example, in the following comment:
 
 ```markdown