Add latest changes from gitlab-org/gitlab@master

21 files changed, 280 insertions, 103 deletions

diff --git a/doc/api/events.md b/doc/api/events.md
index e2ff779f3bf..38d2c934061 100644
--- a/doc/api/events.md
+++ b/doc/api/events.md
@@ -151,6 +151,8 @@ Parameters:
 | `before` | date | no |  Include only events created before a particular date. Please see [here for the supported format](#date-formatting) |
 | `after` | date | no |  Include only events created after a particular date. Please see [here for the supported format](#date-formatting)  |
 | `sort` | string | no | Sort events in `asc` or `desc` order by `created_at`. Default is `desc` |
+| `page` | integer | no | The page of results to return. Defaults to 1. |
+| `per_page` | integer | no | The number of results per page. Defaults to 20. |
 
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/users/:id/events"
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 9c1e4a06b65..7d022a34d1c 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -4835,6 +4835,7 @@ An edge in a connection.
 | `iterations` | [`IterationConnection`](#iterationconnection) | Find iterations. |
 | `jiraImportStatus` | [`String`](#string) | Status of Jira import background job of the project. |
 | `jiraImports` | [`JiraImportConnection`](#jiraimportconnection) | Jira imports into the project. |
+| `jobs` | [`CiJobConnection`](#cijobconnection) | Jobs of a project. This field can only be resolved for one project in any single request. |
 | `jobsEnabled` | [`Boolean`](#boolean) | Indicates if CI/CD pipeline jobs are enabled for the current user. |
 | `label` | [`Label`](#label) | A label available on this project. |
 | `labels` | [`LabelConnection`](#labelconnection) | Labels available on this project. |
diff --git a/doc/api/usage_data.md b/doc/api/usage_data.md
new file mode 100644
index 00000000000..f54a0808d51
--- /dev/null
+++ b/doc/api/usage_data.md
@@ -0,0 +1,68 @@
+---
+stage: Growth
+group: Product Intelligence
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
+type: reference, api
+---
+
+# UsageData API **(FREE SELF)**
+
+The UsageData API, associated with [Usage Ping](../development/usage_ping/index.md), is available only for
+the use of GitLab instance [Administrator](../user/permissions.md) users.
+
+## UsageDataQueries API
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57016) in GitLab 13.11.
+> - [Deployed behind a feature flag](../user/feature_flags.md), disabled by default.
+
+Return all of the raw SQL queries used to compute usage ping.
+
+Example request:
+
+```shell
+curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/usage_data/queries
+```
+
+Sample response
+
+```json
+{
+  "recorded_at": "2021-03-23T06:31:21.267Z",
+  "uuid": null,
+  "hostname": "localhost",
+  "version": "13.11.0-pre",
+  "installation_type": "gitlab-development-kit",
+  "active_user_count": "SELECT COUNT(\"users\".\"id\") FROM \"users\" WHERE (\"users\".\"state\" IN ('active')) AND (\"users\".\"user_type\" IS NULL OR \"users\".\"user_type\" IN (NULL, 6, 4))",
+  "edition": "EE",
+  "license_md5": "c701acc03844c45366dd175ef7a4e19c",
+  "license_id": null,
+  "historical_max_users": 0,
+  "licensee": {
+    "Name": "John Doe1"
+  },
+  "license_user_count": null,
+  "license_starts_at": "1970-01-01",
+  "license_expires_at": "2022-02-23",
+  "license_plan": "starter",
+  "license_add_ons": {
+    "GitLab_FileLocks": 1,
+    "GitLab_Auditor_User": 1
+  },
+  "license_trial": null,
+  "license_subscription_id": "0000",
+  "license": {},
+  "settings": {
+    "ldap_encrypted_secrets_enabled": false,
+    "operating_system": "mac_os_x-11.2.2"
+  },
+  "counts": {
+    "assignee_lists": "SELECT COUNT(\"lists\".\"id\") FROM \"lists\" WHERE \"lists\".\"list_type\" = 3",
+    "boards": "SELECT COUNT(\"boards\".\"id\") FROM \"boards\"",
+    "ci_builds": "SELECT COUNT(\"ci_builds\".\"id\") FROM \"ci_builds\" WHERE \"ci_builds\".\"type\" = 'Ci::Build'",
+    "ci_internal_pipelines": "SELECT COUNT(\"ci_pipelines\".\"id\") FROM \"ci_pipelines\" WHERE (\"ci_pipelines\".\"source\" IN (1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13) OR \"ci_pipelines\".\"source\" IS NULL)",
+    "ci_external_pipelines": "SELECT COUNT(\"ci_pipelines\".\"id\") FROM \"ci_pipelines\" WHERE \"ci_pipelines\".\"source\" = 6",
+    "ci_pipeline_config_auto_devops": "SELECT COUNT(\"ci_pipelines\".\"id\") FROM \"ci_pipelines\" WHERE \"ci_pipelines\".\"config_source\" = 2",
+    "ci_pipeline_config_repository": "SELECT COUNT(\"ci_pipelines\".\"id\") FROM \"ci_pipelines\" WHERE \"ci_pipelines\".\"config_source\" = 1",
+    "ci_runners": "SELECT COUNT(\"ci_runners\".\"id\") FROM \"ci_runners\"",
+...
+```
diff --git a/doc/development/contributing/merge_request_workflow.md b/doc/development/contributing/merge_request_workflow.md
index d55adafa52f..32b0ff45847 100644
--- a/doc/development/contributing/merge_request_workflow.md
+++ b/doc/development/contributing/merge_request_workflow.md
@@ -249,7 +249,7 @@ requirements.
 1. [Black-box tests/end-to-end tests](../testing_guide/testing_levels.md#black-box-tests-at-the-system-level-aka-end-to-end-tests)
    added if required. Please contact [the quality team](https://about.gitlab.com/handbook/engineering/quality/#teams)
    with any questions.
-1. The User Experience (UX) for people not using the features isn't negatively affected.
+1. The new feature does not degrade the user experience of the product.
 
 ## Dependencies
 
diff --git a/doc/development/snowplow.md b/doc/development/snowplow.md
index 5947ec614c8..6803737cd79 100644
--- a/doc/development/snowplow.md
+++ b/doc/development/snowplow.md
@@ -57,13 +57,13 @@ We use Snowplow for the majority of our tracking strategy and it is enabled on G
 - **Admin Area > Settings > General** in the UI.
 - `admin/application_settings/integrations` in your browser.
 
-The following configuration is required:
+Example configuration:
 
-| Name          | Value                     |
-|---------------|---------------------------|
-| Collector     | `snowplow.trx.gitlab.net` |
-| Site ID       | `gitlab`                  |
-| Cookie domain | `.gitlab.com`             |
+| Name          | Value                         |
+|---------------|-------------------------------|
+| Collector     | `your-snowplow-collector.net` |
+| Site ID       | `gitlab`                      |
+| Cookie domain | `.your-gitlab-instance.com`   |
 
 ## Snowplow request flow
 
diff --git a/doc/development/usage_ping/dictionary.md b/doc/development/usage_ping/dictionary.md
index 7a0cca9dccb..a48c59658af 100644
--- a/doc/development/usage_ping/dictionary.md
+++ b/doc/development/usage_ping/dictionary.md
@@ -10004,6 +10004,30 @@ Status: `implemented`
 
 Tiers: `premium`, `ultimate`
 
+### `redis_hll_counters.epics_usage.g_project_management_users_setting_epic_confidential_monthly`
+
+Count of MAU making epics confidential
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_28d/20210310203049_g_project_management_epic_confidential_monthly.yml)
+
+Group: `group::product planning`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
+### `redis_hll_counters.epics_usage.g_project_management_users_setting_epic_confidential_weekly`
+
+Count of WAU making epics confidential
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210310203225_g_project_management_epic_confidential_weekly.yml)
+
+Group: `group::product planning`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
 ### `redis_hll_counters.epics_usage.g_project_management_users_setting_epic_due_date_as_fixed_monthly`
 
 Counts of MAU setting epic due date as inherited
@@ -10100,6 +10124,30 @@ Status: `implemented`
 
 Tiers: `premium`, `ultimate`
 
+### `redis_hll_counters.epics_usage.g_project_management_users_setting_epic_visible_monthly`
+
+Count of MAU making epics visible
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_28d/20210312093611_g_project_management_epic_visible_monthly.yml)
+
+Group: `group::product planning`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
+### `redis_hll_counters.epics_usage.g_project_management_users_setting_epic_visible_weekly`
+
+Count of WAU making epics visible
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210312093243_g_poject_management_epic_visible_weekly.yml)
+
+Group: `group::product planning`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
 ### `redis_hll_counters.epics_usage.g_project_management_users_updating_epic_descriptions_monthly`
 
 Counts of MAU changing epic descriptions
diff --git a/doc/integration/jira/index.md b/doc/integration/jira/index.md
index 86bda729c8a..5992ee8da64 100644
--- a/doc/integration/jira/index.md
+++ b/doc/integration/jira/index.md
@@ -46,7 +46,7 @@ self-managed GitLab) set up the integration to simplify administration.
 
 | If you use Jira on: | GitLab.com customers need: | GitLab self-managed customers need: |
 |-|-|-|
-| [Atlassian cloud](https://www.atlassian.com/cloud) | The [GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview) application installed from the [Atlassian Marketplace](https://marketplace.atlassian.com). This offers real-time sync between GitLab and Jira. | The [GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview), using a workaround process. See a [relevant issue](https://gitlab.com/gitlab-org/gitlab/-/issues/268278) for more information. |
+| [Atlassian cloud](https://www.atlassian.com/cloud) | The [GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview) application installed from the [Atlassian Marketplace](https://marketplace.atlassian.com). This offers real-time sync between GitLab and Jira. | The [GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview), using a workaround process. See the documentation for [installing the GitLab Jira Cloud application for self-managed instances](connect-app.md#install-the-gitlab-jira-cloud-application-for-self-managed-instances) for more information. |
 | Your own server | The Jira DVCS (distributed version control system) connector. This syncs data hourly. | The [Jira DVCS Connector](dvcs.md). |
 
 ## Usage
diff --git a/doc/user/admin_area/settings/project_integration_management.md b/doc/user/admin_area/settings/project_integration_management.md
index 0b9f039880a..b152787b23f 100644
--- a/doc/user/admin_area/settings/project_integration_management.md
+++ b/doc/user/admin_area/settings/project_integration_management.md
@@ -40,7 +40,7 @@ If this is the first time you are setting up instance-level settings for an inte
 When you make further changes to the instance defaults:
 
 - They are immediately applied to all groups and projects that have the integration set to use default settings.
-- They are immediately applied to newer groups and projects, created since you last saved defaults for the
+- They are immediately applied to newer groups and projects, created after you last saved defaults for the
   integration. If your instance-level default setting has the **Enable integration** toggle turned
   on, the integration is automatically enabled for all such groups and projects.
 - Groups and projects with custom settings selected for the integration are not immediately affected and may
@@ -82,7 +82,7 @@ When you make further changes to the group defaults:
 
 - They are immediately applied to all subgroups and projects belonging to the group that have the integration
   set to use default settings.
-- They are immediately applied to newer subgroups and projects, created since you last saved defaults for the
+- They are immediately applied to newer subgroups and projects, even those created after you last saved defaults for the
   integration. If your group-level default setting has the **Enable integration** toggle turned on,
   the integration is automatically enabled for all such subgroups and projects.
 
diff --git a/doc/user/analytics/index.md b/doc/user/analytics/index.md
index b0e6483ea64..6e3c9cf7a5f 100644
--- a/doc/user/analytics/index.md
+++ b/doc/user/analytics/index.md
@@ -46,6 +46,7 @@ in one place.
 The following analytics features are available at the group level:
 
 - [Contribution](../group/contribution_analytics/index.md). **(PREMIUM)**
+- [DevOps Adoption](../group/devops_adoption/index.md). **(ULTIMATE)**
 - [Insights](../group/insights/index.md). **(ULTIMATE)**
 - [Issue](../group/issues_analytics/index.md). **(PREMIUM)**
 - [Productivity](productivity_analytics.md). **(PREMIUM)**
diff --git a/doc/user/application_security/api_fuzzing/index.md b/doc/user/application_security/api_fuzzing/index.md
index 20bf993d7a8..57f877ab7c1 100644
--- a/doc/user/application_security/api_fuzzing/index.md
+++ b/doc/user/application_security/api_fuzzing/index.md
@@ -953,7 +953,7 @@ faults it reports.
 ## Viewing fuzzing faults
 
 The API Fuzzing analyzer produces a JSON report that is collected and used
-[to populate the faults into GitLab vulnerability screens](../index.md#view-details-of-an-api-fuzzing-vulnerability).
+[to populate the faults into GitLab vulnerability screens](#view-details-of-an-api-fuzzing-vulnerability).
 Fuzzing faults show up as vulnerabilities with a severity of Unknown.
 
 The faults that API fuzzing finds require manual investigation and aren't associated with a specific
@@ -962,8 +962,42 @@ they should be fixed. See [handling false positives](#handling-false-positives)
 for information about configuration changes you can make to limit the number of false positives
 reported.
 
-For additional information, see
-[View details of an API Fuzzing vulnerability](../index.md#view-details-of-an-api-fuzzing-vulnerability).
+### View details of an API Fuzzing vulnerability
+
+> Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.7.
+
+Faults detected by API Fuzzing occur in the live web application, and require manual investigation
+to determine if they are vulnerabilities. Fuzzing faults are included as vulnerabilities with a
+severity of Unknown. To facilitate investigation of the fuzzing faults, detailed information is
+provided about the HTTP messages sent and received along with a description of the modification(s)
+made.
+
+Follow these steps to view details of a fuzzing fault:
+
+1. You can view faults in a project, or a merge request:
+
+   - In a project, go to the project's **{shield}** **Security & Compliance > Vulnerability Report**
+     page. This page shows all vulnerabilities from the default branch only.
+   - In a merge request, go the merge request's **Security** section and click the **Expand**
+     button. API Fuzzing faults are available in a section labeled
+     **API Fuzzing detected N potential vulnerabilities**. Click the title to display the fault
+     details.
+
+1. Click the fault's title to display the fault's details. The table below describes these details.
+
+   | Field               | Description                                                                             |
+   |:--------------------|:----------------------------------------------------------------------------------------|
+   | Description         | Description of the fault including what was modified.                                   |
+   | Project             | Namespace and project in which the vulnerability was detected.                          |
+   | Method              | HTTP method used to detect the vulnerability.                                           |
+   | URL                 | URL at which the vulnerability was detected.                                            |
+   | Request             | The HTTP request that caused the fault.                                                 |
+   | Unmodified Response | Response from an unmodified request. This is what a normal working response looks like. |
+   | Actual Response     | Response received from fuzzed request.                                                  |
+   | Evidence            | How we determined a fault occurred.                                                     |
+   | Identifiers         | The fuzzing check used to find this fault.                                              |
+   | Severity            | Severity of the finding is always Unknown.                                              |
+   | Scanner Type        | Scanner used to perform testing.                                                        |
 
 ### Security Dashboard
 
diff --git a/doc/user/application_security/index.md b/doc/user/application_security/index.md
index b164c66e054..e49b3b34e63 100644
--- a/doc/user/application_security/index.md
+++ b/doc/user/application_security/index.md
@@ -178,43 +178,6 @@ authorization credentials. By default, content of specific headers are masked in
 reports. You can specify the list of all headers to be masked. For details, see
 [Hide sensitive information](dast/index.md#hide-sensitive-information).
 
-## View details of an API Fuzzing vulnerability
-
-> Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.7.
-
-Faults detected by API Fuzzing occur in the live web application, and require manual investigation
-to determine if they are vulnerabilities. Fuzzing faults are included as vulnerabilities with a
-severity of Unknown. To facilitate investigation of the fuzzing faults, detailed information is
-provided about the HTTP messages sent and received along with a description of the modification(s)
-made.
-
-Follow these steps to view details of a fuzzing fault:
-
-1. You can view faults in a project, or a merge request:
-
-   - In a project, go to the project's **{shield}** **Security & Compliance > Vulnerability Report**
-     page. This page shows all vulnerabilities from the default branch only.
-   - In a merge request, go the merge request's **Security** section and click the **Expand**
-     button. API Fuzzing faults are available in a section labeled
-     **API Fuzzing detected N potential vulnerabilities**. Click the title to display the fault
-     details.
-
-1. Click the fault's title to display the fault's details. The table below describes these details.
-
-| Field            | Description                                                        |
-|:-----------------|:------------------------------------------------------------------ |
-| Description      | Description of the fault including what was modified.              |
-| Project          | Namespace and project in which the vulnerability was detected.     |
-| Method           | HTTP method used to detect the vulnerability.                      |
-| URL              | URL at which the vulnerability was detected.                       |
-| Request          | The HTTP request that caused the fault.                       |
-| Unmodified Response | Response from an unmodified request. This is what a normal working response looks like. |
-| Actual Response  | Response received from fuzzed request.                             |
-| Evidence         | How we determined a fault occurred.                                |
-| Identifiers      | The fuzzing check used to find this fault.                         |
-| Severity         | Severity of the finding is always Unknown.                          |
-| Scanner Type     | Scanner used to perform testing.                                   |
-
 ## Addressing vulnerabilities
 
 > Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.8.
diff --git a/doc/user/group/devops_adoption/img/group_devops_adoption_v13_11.png b/doc/user/group/devops_adoption/img/group_devops_adoption_v13_11.png
new file mode 100644
index 00000000000..a6ece47ba9a
--- /dev/null
+++ b/doc/user/group/devops_adoption/img/group_devops_adoption_v13_11.png
diff --git a/doc/user/group/devops_adoption/index.md b/doc/user/group/devops_adoption/index.md
new file mode 100644
index 00000000000..3d7e679d071
--- /dev/null
+++ b/doc/user/group/devops_adoption/index.md
@@ -0,0 +1,58 @@
+---
+stage: Manage
+group: Optimize
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
+---
+
+# Group DevOps Adoption **(ULTIMATE)**
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/321083) in GitLab 13.11.
+> - [Deployed behind a feature flag](../../../user/feature_flags.md), disabled by default.
+> - Disabled on GitLab.com.
+> - Not recommended for production use.
+> - To use in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-group-devops-adoption).
+
+WARNING:
+This feature might not be available to you. Check the **version history** note above for details.
+
+[Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/321083) in GitLab 13.11 as a [Beta feature](https://about.gitlab.com/handbook/product/gitlab-the-product/#beta).
+
+Group DevOps Adoption shows you how individual groups and sub-groups within your organization use the following features:
+
+- Issues
+- Merge Requests
+- Approvals
+- Runners
+- Pipelines
+- Deployments
+- Scans
+
+When managing groups in the UI, you can manage your sub-groups with the **Add/Remove sub-groups**
+button, in the top right hand section of your Groups pages.
+
+DevOps Adoption allows you to:
+
+- Verify whether you are getting the return on investment that you expected from GitLab.
+- Identify specific sub-groups that are lagging in their adoption of GitLab so you can help them along in their DevOps journey.
+- Find the sub-groups that have adopted certain features and can provide guidance to other sub-groups on how to use those features.
+
+![DevOps Report](img/group_devops_adoption_v13_11.png)
+
+## Enable or disable Group DevOps Adoption **(ULTIMATE)**
+
+Group DevOps Adoption is under development and not ready for production use. It is
+deployed behind a feature flag that is **disabled by default**.
+[GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
+can enable it.
+
+To enable it:
+
+```ruby
+Feature.enable(:group_devops_adoption)
+```
+
+To disable it:
+
+```ruby
+Feature.disable(:group_devops_adoption)
+```
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index e858324b889..3641288726e 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -291,6 +291,7 @@ group.
 | View group Audit Events                                |       |          | ✓ (7)     | ✓ (7)      | ✓     |
 | Disable notification emails                            |       |          |           |            | ✓     |
 | View Contribution analytics                            | ✓     | ✓        | ✓         | ✓          | ✓     |
+| View Group DevOps Adoption **(ULTIMATE)**              |       | ✓        | ✓         | ✓          | ✓     |
 | View Insights **(ULTIMATE)**                           | ✓     | ✓        | ✓         | ✓          | ✓     |
 | View Issue analytics **(PREMIUM)**                     | ✓     | ✓        | ✓         | ✓          | ✓     |
 | View Productivity analytics **(PREMIUM)**              |       | ✓        | ✓         | ✓          | ✓     |
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index 77f7e66b9a5..4e4cdf5dc36 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -76,6 +76,9 @@ The following is hidden from your user profile page (`https://gitlab.example.com
 - Date when account was created
 - Tabs for activity, groups, contributed projects, personal projects, starred projects, snippets
 
+NOTE:
+Making your user profile page private does not hide your public resources from the REST or GraphQL APIs.
+
 ## Add external accounts to your user profile page
 
 You can add links to certain other external accounts you might have, like Skype and Twitter.
diff --git a/doc/user/project/integrations/index.md b/doc/user/project/integrations/index.md
index 5628a9bc5e5..c7772ac2238 100644
--- a/doc/user/project/integrations/index.md
+++ b/doc/user/project/integrations/index.md
@@ -12,11 +12,14 @@ You can find the available integrations under your project's
 
 ## Integrations
 
-Integrations allow you to integrate GitLab with other applications.
-They are a bit like plugins in that they allow a lot of freedom in
-adding functionality to GitLab.
-
-Learn more [about integrations](overview.md).
+Like plugins, integrations allow you to integrate GitLab with other applications, adding additional features.
+For more information, read the
+[overview of integrations](overview.md) or learn how to manage your integrations:
+
+- *For GitLab 13.3 and later,* read [Project integration management](../../admin_area/settings/project_integration_management.md).
+- *For GitLab 13.2 and earlier,* read [Service Templates](services_templates.md),
+  which are deprecated and [scheduled to be removed](https://gitlab.com/gitlab-org/gitlab/-/issues/268032)
+  in GitLab 14.0.
 
 ## Project webhooks
 
diff --git a/doc/user/project/integrations/jira.md b/doc/user/project/integrations/jira.md
index b5f37a4069f..90fdb1939b5 100644
--- a/doc/user/project/integrations/jira.md
+++ b/doc/user/project/integrations/jira.md
@@ -54,11 +54,8 @@ project can interact with _all_ Jira projects in that instance, once configured.
 - Other features, you do not have to explicitly associate a GitLab project with any single Jira
   project.
 
-If you have one Jira instance, you can pre-fill the settings. For more information, see the
-documentation for:
-
-- [Project integration management](../../admin_area/settings/project_integration_management.md).
-- [Services Templates](services_templates.md).
+If you have a single Jira instance, you can pre-fill the settings. For more information, read the
+documentation for [central administration of project integrations](../../admin_area/settings/project_integration_management.md).
 
 To enable the Jira service in GitLab, you must:
 
diff --git a/doc/user/project/integrations/overview.md b/doc/user/project/integrations/overview.md
index 3775719a8a4..53798ba664f 100644
--- a/doc/user/project/integrations/overview.md
+++ b/doc/user/project/integrations/overview.md
@@ -72,13 +72,6 @@ supported by `push_hooks` and `tag_push_hooks` events aren't executed.
 The number of branches or tags supported can be changed via
 [`push_event_hooks_limit` application setting](../../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
 
-## Service templates
-
-Service templates are a way to set predefined values for a project integration across
-all new projects on the instance.
-
-Read more about [Service templates](services_templates.md).
-
 ## Project integration management
 
 Project integration management lets you control integration settings across all projects
@@ -87,6 +80,19 @@ instance configuration or provide custom settings.
 
 Read more about [Project integration management](../../admin_area/settings/project_integration_management.md).
 
+### Service templates
+
+[Service templates](services_templates.md) were a way to set predefined values for
+a project integration across all new projects on the instance. They are deprecated and
+[scheduled to be removed](https://gitlab.com/gitlab-org/gitlab/-/issues/268032)
+in GitLab 14.0.
+
+GitLab recommends you use [project integration management](../../admin_area/settings/project_integration_management.md)
+instead of service templates. GitLab versions 13.3 and later provide
+[instance-level integrations](../../admin_area/settings/project_integration_management.md#project-integration-management)
+you can use.
+instead.
+
 ## Troubleshooting integrations
 
 Some integrations use service hooks for integration with external applications. To confirm which ones use service hooks, see the [integrations listing](#integrations-listing) above. GitLab stores details of service hook requests made within the last 2 days. To view details of the requests, go to that integration's configuration page.
diff --git a/doc/user/project/integrations/services_templates.md b/doc/user/project/integrations/services_templates.md
index 66810d8a01b..93ce74eb735 100644
--- a/doc/user/project/integrations/services_templates.md
+++ b/doc/user/project/integrations/services_templates.md
@@ -36,10 +36,11 @@ does not provide central administration of integration settings.
 ## Central administration of project integrations
 
 A new set of features is being introduced in GitLab to provide more control over
-how integrations are configured at the instance, group, and project level.
+how integrations are configured at the instance, group, and project level. For
+more information, read more about:
 
-[Read more about setting up project integration management](../../admin_area/settings/project_integration_management.md)
-(introduced in GitLab 13.3) and [our plans for managing integrations](https://gitlab.com/groups/gitlab-org/-/epics/2137).
+- [Setting up project integration management](../../admin_area/settings/project_integration_management.md) (introduced in GitLab 13.3)
+- [Our plans for managing integrations](https://gitlab.com/groups/gitlab-org/-/epics/2137).
 
 ## Enable a service template
 
diff --git a/doc/user/project/issues/related_issues.md b/doc/user/project/issues/related_issues.md
index 43939da4c4a..0b0d028b0ce 100644
--- a/doc/user/project/issues/related_issues.md
+++ b/doc/user/project/issues/related_issues.md
@@ -4,42 +4,34 @@ group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Related issues **(FREE)**
+# Linked issues **(FREE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1797) in GitLab 9.4.
 > - The simple "relates to" relationship [moved](https://gitlab.com/gitlab-org/gitlab/-/issues/212329) to [GitLab Free](https://about.gitlab.com/pricing/) in 13.4.
 
-Related issues are a bi-directional relationship between any two issues
-and appear in a block below the issue description. Issues can be across groups
-and projects.
+Linked issues are a bi-directional relationship between any two issues and appear in a block below
+the issue description. Issues can be across groups and projects.
 
-You can set any issue as:
-
-- Related to another issue
-- Blocking another issue **(PREMIUM)**
-- Blocked by another issue **(PREMIUM)**
-
-The relationship only shows up in the UI if the user can see both issues.
-
-When you try to close an issue that has open blockers, a warning is displayed.
+The relationship only shows up in the UI if the user can see both issues. When you try to close an
+issue that has open blockers, a warning is displayed.
 
 NOTE:
-To manage related issues through our API, visit the [issue links API documentation](../../../api/issue_links.md).
+To manage linked issues through our API, visit the [issue links API documentation](../../../api/issue_links.md).
 
-## Adding a related issue
+## Add a linked issue
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/2035) in GitLab 12.8.
 > - [Improved](https://gitlab.com/gitlab-org/gitlab/-/issues/34239) to warn when attempting to close an issue that is blocked by others in GitLab 13.0.
 >   When you try to close an issue with open blockers, you see a warning that you can dismiss.
 
-1. Relate one issue to another by clicking the related issues "+" button
-in the header of the related issue block.
+1. Link one issue to another by selecting the add linked issue button (**{plus}**) in the
+   **Linked issues** section of an issue.
 
 1. Select the relationship the between the two issues. Either:
-   - **relates to**.
-   - **blocks**. **(PREMIUM)**
-   - **is blocked by**. **(PREMIUM)**
-1. Input the issue reference number or paste in the full URL of the issue.
+   - **relates to**
+   - **blocks** **(PREMIUM)**
+   - **is blocked by** **(PREMIUM)**
+1. Input the issue number or paste in the full URL of the issue.
 
    ![Adding a related issue](img/related_issues_add_v12_8.png)
 
@@ -53,20 +45,20 @@ in the header of the related issue block.
 
    Valid references are added to a temporary list that you can review.
 
-1. When you have added all the related issues, click **Add** to submit.
+1. When you have added all the linked issues, select **Add**.
 
-When you have finished adding all related issues, you can see
+When you have finished adding all linked issues, you can see
 them categorized so their relationships can be better understood visually.
 
 ![Related issue block](img/related_issue_block_v12_8.png)
 
-## Removing a related issue
+## Remove a linked issue
 
-In the related issues block, click the remove button (**{close}**) on the right-side of each issue
-token that you wish to remove.
+In the **Linked issues** section of an issue, click the remove button (**{close}**) on the
+right-side of each issue token to remove.
 
-Due to the bi-directional relationship, it no longer appears in either issue.
+Due to the bi-directional relationship, the relationship no longer appears in either issue.
 
 ![Removing a related issue](img/related_issues_remove_v12_8.png)
 
-Please access our [permissions](../../permissions.md) page for more information.
+Access our [permissions](../../permissions.md) page for more information.
diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md
index f3b29757a12..62f61c01e19 100644
--- a/doc/user/project/settings/index.md
+++ b/doc/user/project/settings/index.md
@@ -48,11 +48,10 @@ Compliance framework labels do not affect your project settings.
 #### Custom compliance frameworks
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/276221) in GitLab 13.9.
-> - It's [deployed behind a feature flag](../../feature_flags.md), disabled by default.
-> - It can be enabled or disabled for a single group
-> - It's disabled on GitLab.com.
-> - It's not recommended for production use.
-> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-custom-compliance-frameworks). **(PREMIUM)**
+> - [Deployed behind a feature flag](../../feature_flags.md).
+> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/287779) in GitLab 13.11.
+> - Enabled on GitLab.com.
+> - Recommended for production use.
 
 WARNING:
 This feature might not be available to you. Check the **version history** note above for details.