Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

4 files changed, 36 insertions, 22 deletions

diff --git a/doc/subscriptions/bronze_starter.md b/doc/subscriptions/bronze_starter.md
index 2c66d32f669..7ca3a3ffade 100644
--- a/doc/subscriptions/bronze_starter.md
+++ b/doc/subscriptions/bronze_starter.md
@@ -17,9 +17,7 @@ the tiers are no longer mentioned in GitLab documentation:
 
 - [Activate GitLab EE with a license](../user/admin_area/license.md)
 - [Add a help message to the sign-in page](../user/admin_area/settings/help_page.md#add-a-help-message-to-the-sign-in-page)
-- [Burndown and burnup charts](../user/project/milestones/burndown_and_burnup_charts.md),
-  including [per-project charts](../user/project/milestones/index.md#project-burndown-charts) and
-  [per-group charts](../user/project/milestones/index.md#group-burndown-charts)
+- [Burndown and burnup charts](../user/project/milestones/burndown_and_burnup_charts.md) in the [Milestone View](../user/project/milestones/index.md#burndown-charts),
 - [Code owners](../user/project/code_owners.md)
 - Description templates:
   - [Setting a default template for merge requests and issues](../user/project/description_templates.md#set-a-default-template-for-merge-requests-and-issues)
@@ -100,7 +98,7 @@ the tiers are no longer mentioned in GitLab documentation:
 - Runners:
   - Run pipelines in the parent project [for merge requests from a forked project](../ci/pipelines/merge_request_pipelines.md#run-pipelines-in-the-parent-project)
   - [Shared runners CI/CD minutes](../ci/pipelines/cicd_minutes.md)
-- [Push rules](../push_rules/push_rules.md)
+- [Push rules](../user/project/repository/push_rules.md)
 - SAML for self-managed GitLab instance:
   - [Administrator groups](../integration/saml.md#administrator-groups)
   - [Auditor groups](../integration/saml.md#auditor-groups)
diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md
index b72fad02b3d..c94d90f61b8 100644
--- a/doc/subscriptions/gitlab_com/index.md
+++ b/doc/subscriptions/gitlab_com/index.md
@@ -14,7 +14,7 @@ You don't need to install anything to use GitLab SaaS, you only need to
 - [A subscription](https://about.gitlab.com/pricing/).
 - [The number of seats you want](#how-seat-usage-is-determined).
 
-The subscription determines which features are available for your private projects. Public projects automatically get **Ultimate** tier features.
+The subscription determines which features are available for your private projects. Organizations with public open source projects can actively apply to our [GitLab for Open Source Program](https://about.gitlab.com/solutions/open-source/join/).
 
 Qualifying open source projects also get 50,000 CI/CD minutes and free access to the **Ultimate** tier
 through the [GitLab for Open Source program](https://about.gitlab.com/solutions/open-source/).
@@ -44,7 +44,7 @@ To subscribe to GitLab SaaS:
 
 Prerequisite:
 
-- You must have the Owner [role](../../user/permissions.md) for the group.
+- You must have the Owner role for the group.
 
 To see the status of your GitLab SaaS subscription:
 
@@ -79,10 +79,12 @@ Every user is included in seat usage, with the following exceptions:
 
 - Users who are pending approval.
 - Members with the Guest role on an Ultimate subscription.
-- GitLab-created service accounts: `Ghost User` and bots
-  ([`Support Bot`](../../user/project/service_desk.md#support-bot-user),
-  [`Project bot users`](../../user/project/settings/project_access_tokens.md#project-bot-users), and
-  so on.)
+- GitLab-created service accounts:
+  - [Ghost User](../../user/profile/account/delete_account.md#associated-records).
+  - Bots such as:
+    - [Support Bot](../../user/project/service_desk.md#support-bot-user).
+    - [Bot users for projects](../../user/project/settings/project_access_tokens.md#bot-users-for-projects).
+    - [Bot users for groups](../../user/group/settings/group_access_tokens.md#bot-users-for-groups).
 
 Seat usage is reviewed [quarterly or annually](../quarterly_reconciliation.md).
 
@@ -254,7 +256,7 @@ expiration date without a gap in available service. An invoice is
 generated for the renewal and available for viewing or download on the
 [View invoices](https://customers.gitlab.com/receipts) page.
 
-#### Enable automatic renewal
+#### Enable or disable automatic renewal
 
 To view or change automatic subscription renewal (at the same tier as the
 previous period), log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in), and:
@@ -290,21 +292,28 @@ for more information.
 ### Purchase additional CI/CD minutes
 
 You can [purchase additional minutes](../../ci/pipelines/cicd_minutes.md#purchase-additional-cicd-minutes)
-for your personal or group namespace.
+for your personal or group namespace. CI/CD minutes are a **one-time purchase**, so they do not renew.
 
-## Storage subscription
+## Add-on subscription for additional Storage and Transfer
+
+NOTE:
+Free namespaces are subject to a 5GB storage and 10GB transfer [soft limit](https://about.gitlab.com/pricing). Once all storage is available to view in the usage quota workflow, GitLab will automatically enforce the namespace storage limit and the project limit will be removed. This change will be announced separately. The storage and transfer add-on can be purchased to increase the limits.
 
 Projects have a free storage quota of 10 GB. To exceed this quota you must first [purchase one or
-more storage subscription units](#purchase-more-storage). Each unit provides 10 GB of additional
+more storage subscription units](#purchase-more-storage-and-transfer). Each unit provides 10 GB of additional
 storage per namespace. A storage subscription is renewed annually. For more details, see
 [Usage Quotas](../../user/usage_quotas.md).
 
 When the amount of purchased storage reaches zero, all projects over the free storage quota are
 locked. Projects can only be unlocked by purchasing more storage subscription units.
 
-### Purchase more storage
+### Purchase more storage and transfer
+
+You can purchase a storage subscription for your personal or group namespace.
 
-You can purchase storage for your personal or group namespace.
+NOTE:
+Storage subscriptions **[renew automatically](#automatic-renewal) each year**.
+You can [cancel the subscription](#enable-or-disable-automatic-renewal) to disable the automatic renewal.
 
 #### For your personal namespace
 
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index 4e4c0309c3d..3f9a1898505 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -150,11 +150,11 @@ To change the namespace linked to a subscription:
 1. Navigate to the **Manage Purchases** page.
 1. Select **Change linked namespace**.
 1. Select the desired group from the **This subscription is for** dropdown. For a group to appear
-   here, you must have the Owner [role](../user/permissions.md)
+   here, you must have the Owner role
    for that group.
 1. Select **Proceed to checkout**.
 
-Subscription charges are calculated based on the total number of users in a group, including its subgroups and nested projects. If the total number of users exceeds the number of seats in your subscription, your account is charged for the additional users.
+Subscription charges are calculated based on the total number of users in a group, including its subgroups and nested projects. If the [total number of users](gitlab_com/index.md#view-seat-usage) exceeds the number of seats in your subscription, your account is charged for the additional users and you need to pay for the overage before you can change the linked namespace. 
 
 Only one namespace can be linked to a subscription.
 
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index 5ac2c5a5037..cb9db3673ac 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -65,10 +65,12 @@ billable user, with the following exceptions:
 - Users who are [pending approval](../../user/admin_area/moderate_users.md#users-pending-approval).
 - Members with the Guest role on an Ultimate subscription.
 - Users without project or group memberships on an Ultimate subscription.
-- GitLab-created service accounts: `Ghost User` and bots
-  ([`Support Bot`](../../user/project/service_desk.md#support-bot-user),
-  [`Project bot users`](../../user/project/settings/project_access_tokens.md#project-bot-users), and
-  so on.)
+- GitLab-created service accounts:
+  - [Ghost User](../../user/profile/account/delete_account.md#associated-records).
+  - Bots such as:
+    - [Support Bot](../../user/project/service_desk.md#support-bot-user).
+    - [Bot users for projects](../../user/project/settings/project_access_tokens.md#bot-users-for-projects).
+    - [Bot users for groups](../../user/group/settings/group_access_tokens.md#bot-users-for-groups).
 
 **Billable users** as reported in the `/admin` section is updated once per day.
 
@@ -307,6 +309,11 @@ The **License Usage** CSV includes the following details:
   - Date the count was recorded
   - Active user count
 
+NOTES:
+
+- All timestamps are displayed in UTC.
+- A custom format is used for [dates](https://gitlab.com/gitlab-org/gitlab/blob/3be39f19ac3412c089be28553e6f91b681e5d739/config/initializers/date_time_formats.rb#L7) and [times](https://gitlab.com/gitlab-org/gitlab/blob/3be39f19ac3412c089be28553e6f91b681e5d739/config/initializers/date_time_formats.rb#L13) in CSV files.
+
 ## Renew your subscription
 
 To renew your subscription,