Add latest changes from gitlab-org/gitlab@master

5 files changed, 75 insertions, 64 deletions

diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 7f496e1aded..792e10e85b7 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -14668,9 +14668,9 @@ Possible states of a user.
 
 | Value | Description |
 | ----- | ----------- |
-| <a id="visibilityscopesenuminternal"></a>`internal` |  |
-| <a id="visibilityscopesenumprivate"></a>`private` |  |
-| <a id="visibilityscopesenumpublic"></a>`public` |  |
+| <a id="visibilityscopesenuminternal"></a>`internal` | The snippet is visible for any logged in user except external users. |
+| <a id="visibilityscopesenumprivate"></a>`private` | The snippet is visible only to the snippet creator. |
+| <a id="visibilityscopesenumpublic"></a>`public` | The snippet can be accessed without any authentication. |
 
 ### `VulnerabilityDismissalReason`
 
diff --git a/doc/api/project_snippets.md b/doc/api/project_snippets.md
index 070429eafd5..01ca5da3039 100644
--- a/doc/api/project_snippets.md
+++ b/doc/api/project_snippets.md
@@ -16,7 +16,7 @@ Constants for snippet visibility levels are:
 
 | visibility | Description |
 | ---------- | ----------- |
-| `private`  | The snippet is visible only the snippet creator |
+| `private`  | The snippet is visible only to the snippet creator |
 | `internal` | The snippet is visible for any logged in user except [external users](../user/permissions.md#external-users) |
 | `public`   | The snippet can be accessed without any authentication |
 
diff --git a/doc/development/usage_ping/dictionary.md b/doc/development/usage_ping/dictionary.md
index 75d65f8e5df..083520eccd3 100644
--- a/doc/development/usage_ping/dictionary.md
+++ b/doc/development/usage_ping/dictionary.md
@@ -2446,6 +2446,18 @@ Status: `implemented`
 
 Tiers: `free`, `premium`, `ultimate`
 
+### `counts.in_product_marketing_email_experience_0_sent`
+
+Total sent emails of the experience track's first email
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml)
+
+Group: `group::activation`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
 ### `counts.in_review_folder`
 
 Missing description
@@ -16366,7 +16378,7 @@ Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.project_imports.bitbucket_server`
 
@@ -16378,7 +16390,7 @@ Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.project_imports.git`
 
@@ -16390,7 +16402,7 @@ Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.project_imports.gitea`
 
@@ -16402,7 +16414,7 @@ Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.project_imports.github`
 
@@ -16414,7 +16426,7 @@ Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.project_imports.gitlab`
 
@@ -16426,7 +16438,7 @@ Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.project_imports.gitlab_migration`
 
@@ -16438,7 +16450,7 @@ Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.project_imports.gitlab_project`
 
@@ -16450,7 +16462,7 @@ Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.project_imports.manifest`
 
@@ -16462,7 +16474,7 @@ Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.projects_imported.bitbucket`
 
@@ -18088,15 +18100,15 @@ Tiers: `free`
 
 ### `usage_activity_by_stage_monthly.manage.group_imports.group_import`
 
-Missing description
+Number of group import states
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183709_group_import.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.group_saml_enabled`
 
@@ -18128,7 +18140,7 @@ Missing description
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183737_groups_imported.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `deprecated`
 
@@ -18304,63 +18316,63 @@ Tiers: `free`
 
 ### `usage_activity_by_stage_monthly.manage.project_imports.bitbucket`
 
-Missing description
+Count of projects imported from Bitbucket
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183650_bitbucket.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.project_imports.bitbucket_server`
 
-Missing description
+Count of projects imported from Bitbucket Server
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183652_bitbucket_server.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.project_imports.git`
 
-Missing description
+Count of projects imported from Git
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183655_git.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.project_imports.gitea`
 
-Missing description
+Count of projects imported from Gitea
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183653_gitea.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.project_imports.github`
 
-Missing description
+Count of projects imported from GitHub
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183648_github.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.project_imports.gitlab`
 
@@ -18368,11 +18380,11 @@ Missing description
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183646_gitlab.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.project_imports.gitlab_migration`
 
@@ -18380,11 +18392,11 @@ Missing description
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183659_gitlab_migration.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.project_imports.gitlab_project`
 
@@ -18392,11 +18404,11 @@ Missing description
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183644_gitlab_project.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.project_imports.manifest`
 
@@ -18404,35 +18416,35 @@ Missing description
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183657_manifest.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.projects_imported.bitbucket`
 
-Missing description
+Count of projects imported from Bitbucket
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183720_bitbucket.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `deprecated`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.projects_imported.bitbucket_server`
 
-Missing description
+Count of projects imported from Bitbucket Server
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183722_bitbucket_server.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `deprecated`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.projects_imported.git`
 
@@ -18532,15 +18544,15 @@ Tiers:
 
 ### `usage_activity_by_stage_monthly.manage.unique_users_all_imports`
 
-Missing description
+Number of users from projects imported
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml)
 
-Group: ``
+Group: `group::import`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.user_auth_by_provider.google_oauth2`
 
diff --git a/doc/update/index.md b/doc/update/index.md
index 4c4dfe79d03..693e5be38ed 100644
--- a/doc/update/index.md
+++ b/doc/update/index.md
@@ -342,10 +342,10 @@ possible.
 
 ## Version-specific upgrading instructions
 
-Each month, a major or minor release of GitLab is published along with a
+Each month, major, minor or patch releases of GitLab are published along with a
 [release post](https://about.gitlab.com/releases/categories/releases/).
-You should check all the major and minor versions you're passing over.
-At the end of those release posts, there are three sections to look for:
+You should read the release posts for all versions you're passing over.
+At the end of major and minor release posts, there are three sections to look for specifically:
 
 - Deprecations
 - Removals
diff --git a/doc/user/analytics/ci_cd_analytics.md b/doc/user/analytics/ci_cd_analytics.md
index 284e87e9b35..b666b388eb8 100644
--- a/doc/user/analytics/ci_cd_analytics.md
+++ b/doc/user/analytics/ci_cd_analytics.md
@@ -4,12 +4,11 @@ group: Release
 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
 ---
 
-# CI/CD Analytics
+# CI/CD Analytics **(FREE)**
 
-## Pipeline success and duration charts **(FREE)**
+## Pipeline success and duration charts
 
-> - Introduced in GitLab 3.1.1 as Commit Stats, and later renamed to Pipeline Charts.
-> - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/38318) to CI/CD Analytics in GitLab 12.8.
+> [Renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/38318) to CI/CD Analytics in GitLab 12.8.
 
 GitLab tracks the history of your pipeline successes and failures, as well as how long each pipeline
 ran. To view this information, go to **Analytics > CI/CD Analytics**.
@@ -48,14 +47,14 @@ performance indicators for software development teams:
 
 The following table shows the supported metrics, at which level they are supported, and which GitLab version (API and UI) they were introduced:
 
-| Metric           | Level               | API version                                | Chart (UI) version                                     | Comments                                                                               |
-| --------------- | -----------               | ---------------                      | ----------                                      | -------                                                                               |
-| `deployment_frequency`    | Project-level       | [13.7+](../../api/dora/metrics.md)  | [13.8+](#deployment-frequency-charts) | The [old API endpoint](../../api/dora4_project_analytics.md) was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/323713) in 13.10. |
-| `deployment_frequency`    | Group-level     | [13.10+](../../api/dora/metrics.md) | To be supported  |                                                                                       |
-| `lead_time_for_changes`   | Project-level      | [13.10+](../../api/dora/metrics.md) | [13.11+](#lead-time-charts)  | Unit in seconds. Aggregation method is median.                                                                    |
-| `lead_time_for_changes`   | Group-level     |  [13.10+](../../api/dora/metrics.md) | To be supported  | Unit in seconds. Aggregation method is median.                                                                    |
-| `change_failure_rate`     | Project/Group-level   |  To be supported                      | To be supported  |                                                                                       |
-| `time_to_restore_service` | Project/Group-level   |  To be supported                      | To be supported  |                                                                                       |
+| Metric                    | Level               | API version                          | Chart (UI) version                    | Comments  |
+|---------------------------|---------------------|--------------------------------------|---------------------------------------|-----------|
+| `deployment_frequency`    | Project-level       | [13.7+](../../api/dora/metrics.md)   | [13.8+](#deployment-frequency-charts) | The [old API endpoint](../../api/dora4_project_analytics.md) was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/323713) in 13.10. |
+| `deployment_frequency`    | Group-level         | [13.10+](../../api/dora/metrics.md)  | To be supported                       | |
+| `lead_time_for_changes`   | Project-level       | [13.10+](../../api/dora/metrics.md)  | [13.11+](#lead-time-charts)           | Unit in seconds. Aggregation method is median. |
+| `lead_time_for_changes`   | Group-level         |  [13.10+](../../api/dora/metrics.md) | To be supported                       | Unit in seconds. Aggregation method is median. |
+| `change_failure_rate`     | Project/Group-level |  To be supported                     | To be supported                       | |
+| `time_to_restore_service` | Project/Group-level |  To be supported                     | To be supported                       | |
 
 ### Deployment frequency charts **(ULTIMATE)**