Add latest changes from gitlab-org/gitlab@master

16 files changed, 175 insertions, 74 deletions

diff --git a/doc/api/commits.md b/doc/api/commits.md
index 609965f341d..5a3481ee086 100644
--- a/doc/api/commits.md
+++ b/doc/api/commits.md
@@ -753,7 +753,7 @@ Example response:
 
 ## List merge requests associated with a commit
 
-Get a list of merge requests related to the specified commit.
+Returns information about the merge request that originally introduced a specific commit.
 
 ```plaintext
 GET /projects/:id/repository/commits/:sha/merge_requests
diff --git a/doc/api/settings.md b/doc/api/settings.md
index 6ca94f840a2..6d92ceec285 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -524,8 +524,8 @@ listed in the descriptions of the relevant settings.
 | `whats_new_variant`                      | string           | no                                   | What's new variant, possible values: `all_tiers`, `current_tier`, and `disabled`. |
 | `web_ide_clientside_preview_enabled`     | boolean          | no                                   | Live Preview (allow live previews of JavaScript projects in the Web IDE using CodeSandbox Live Preview). |
 | `wiki_page_max_content_bytes`            | integer          | no                                   | Maximum wiki page content size in **bytes**. Default: 52428800 Bytes (50 MB). The minimum value is 1024 bytes. |
-| `jira_connect_application_key`           | String           | no                                   | Application ID of the OAuth application that should be used to authenticate with the GitLab.com for Jira Cloud app |
-| `jira_connect_proxy_url`                 | String           | no                                   | URL of the GitLab instance that should be used as a proxy for the GitLab.com for Jira Cloud app |
+| `jira_connect_application_key`           | String           | no                                   | Application ID of the OAuth application that should be used to authenticate with the GitLab for Jira Cloud app |
+| `jira_connect_proxy_url`                 | String           | no                                   | URL of the GitLab instance that should be used as a proxy for the GitLab for Jira Cloud app |
 
 ## Housekeeping fields
 
diff --git a/doc/development/database/new_database_migration_version.md b/doc/development/database/new_database_migration_version.md
new file mode 100644
index 00000000000..b97ecd83f37
--- /dev/null
+++ b/doc/development/database/new_database_migration_version.md
@@ -0,0 +1,64 @@
+---
+stage: Data Stores
+group: Database
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# Introducing a new database migration version
+
+At GitLab we've added many helpers for the database migrations to help developers manipulate
+the schema and data of tables on a large scale like on GitLab.com. To avoid the repetitive task
+of including the helpers into each database migration, we use a subclass of the Rails `ActiveRecord::Migration`
+class that we use for all of our database migrations. This subclass is `Gitlab::Database::Migration`, and it already
+includes all the helpers that developers can use. You can see many use cases of helpers built
+in-house in [Avoiding downtime in migrations](avoiding_downtime_in_migrations.md).
+
+Sometimes, we need to add or modify existing an helper's functionality without having a reverse effect on all the
+previous database migrations. That's why we introduced versioning to `Gitlab::Database::Migration`. Now,
+each database migration can inherit the latest version of this class at the time of the writing the database migration.
+After we add a new feature, those old database migrations are no longer affected. We usually
+refer to the version using `Gitlab::Database::Migration[2.1]`, where `2.1` is the current version.
+
+Because we are chasing a moving target, adding a new migration and deprecating older versions
+can be challenging. Database migrations are introduced every day, and this can break the pipeline.
+In this document, we explain a two-step method to add a new database migration version.
+
+1. [Introduce a new version, and keep the older version allowed](#introduce-a-new-version-and-keep-the-older-version-allowed)
+1. [Prevent the usage of the older database migration version](#prevent-the-usage-of-the-older-database-migration-version)
+
+## Introduce a new version, and keep the older version allowed
+
+1. The new version can be added to the
+   [`migration.rb`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/database/migration.rb)
+   class, along with any new helpers that should be included in the new version.
+   Make sure that `current_version` refers to this new version. For example:
+
+   ```ruby
+         class V2_2 < V2_1 # rubocop:disable Naming/ClassAndModuleCamelCase
+           include Gitlab::Database::MigrationHelpers::ANY_NEW_HELPER
+         end
+
+         def self.current_version
+           2.2
+         end
+   ```
+
+1. Update all the examples in the documentation to refer to the new database
+   migration version `Gitlab::Database::Migration[2.2]`.
+1. Make sure that [`migration_spec.rb`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/spec/db/migration_spec.rb)
+   doesn't fail for the new database migrations by adding an open date rate for
+   the **new database version**.
+
+## Prevent the usage of the older database migration version
+
+After some time passes, and ensuring all developers are using the
+new database migration version in their merge requests, prevent the older
+version from being used:
+
+1. Close the date range in [`migration_spec.rb`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/spec/db/migration_spec.rb)
+   for the older database version.
+1. Modify the
+   [`RuboCop::Cop::Migration::VersionedMigrationClass`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/rubocop/cop/migration/versioned_migration_class.rb)
+   and [its owned tests](https://gitlab.com/gitlab-org/gitlab/-/blob/master/spec/rubocop/cop/migration/versioned_migration_class_spec.rb).
+1. Communicate this change on our Slack `#backend` and `#database` channels and
+   [Engineering Week-in-Review document](https://about.gitlab.com/handbook/engineering/#communication).
diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md
index 72263699a4c..c099eadc69c 100644
--- a/doc/development/documentation/styleguide/word_list.md
+++ b/doc/development/documentation/styleguide/word_list.md
@@ -1052,6 +1052,14 @@ The search results are displayed on a search page.
 
 Searching is different from [filtering](#filter).
 
+## seats
+
+When referring to the subscription billing model:
+
+- For GitLab SaaS, use **seats**. Customers purchase seats. Users occupy seats when they are invited
+to a group, with some [exceptions](../../../subscriptions/gitlab_com/index.md#how-seat-usage-is-determined).
+- For GitLab self-managed, use **users**. Customers purchase subscriptions for a specified number of **users**.
+
 ## section
 
 Use **section** to describe an area on a page. For example, if a page has lines that separate the UI
diff --git a/doc/development/integrations/jira_connect.md b/doc/development/integrations/jira_connect.md
index 5b460f8723a..eca4d9775c5 100644
--- a/doc/development/integrations/jira_connect.md
+++ b/doc/development/integrations/jira_connect.md
@@ -54,7 +54,7 @@ To install the app in Jira:
 
    1. Select **Upload**.
 
-   If the install was successful, you should see the **GitLab.com for Jira Cloud** app under **Manage apps**.
+   If the install was successful, you should see the **GitLab for Jira Cloud** app under **Manage apps**.
    You can also select **Getting Started** to open the configuration page rendered from your GitLab instance.
 
    _Note that any changes to the app descriptor requires you to uninstall then reinstall the app._
diff --git a/doc/development/pipelines/index.md b/doc/development/pipelines/index.md
index 07c5db908b0..d3ba8ea1561 100644
--- a/doc/development/pipelines/index.md
+++ b/doc/development/pipelines/index.md
@@ -188,7 +188,7 @@ Note that the merge request also needs to have the `master:broken` or `master:fo
 
 To make your Revert MRs faster, use the [revert MR template](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/merge_request_templates/Revert%20To%20Resolve%20Incident.md) **before** you create your merge request. It will apply the `pipeline:expedite` label and others that will expedite the pipelines that run on the merge request.
 
-### The `~pipeline:expedite` label
+### The `pipeline:expedite` label
 
 When this label is assigned, the following steps of the CI/CD pipeline are skipped:
 
@@ -207,11 +207,31 @@ If you want to force all the RSpec jobs to run regardless of your changes, you c
 WARNING:
 Forcing all jobs on docs only related MRs would not have the prerequisite jobs and would lead to errors
 
+### End-to-end jobs
+
+The [`e2e:package-and-test`](../testing_guide/end_to_end/index.md#using-the-package-and-test-job) child pipeline
+runs end-to-end jobs automatically depending on changes, and is manual in other cases.
+See `.qa:rules:package-and-test` in
+[`rules.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/rules.gitlab-ci.yml) for
+the specific list of rules.
+
+If you want to force `e2e:package-and-test` to run regardless of your changes, you can add the
+`pipeline:run-all-e2e` label to the merge request.
+
+Consult the [End-to-end Testing](../testing_guide/end_to_end/index.md) dedicated page for more information.
+
 ### Review app jobs
 
-Consult the [Review Apps](../testing_guide/review_apps.md) dedicated page for more information.
+The [`start-review-app-pipeline`](../testing_guide/review_apps.md) child pipeline deploys a Review App and runs
+end-to-end tests against it automatically depending on changes, and is manual in other cases.
+See `.review:rules:start-review-app-pipeline` in
+[`rules.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/rules.gitlab-ci.yml) for
+the specific list of rules.
+
+If you want to force a Review App to be deployed regardless of your changes, you can add the
+`pipeline:run-review-app` label to the merge request.
 
-If you want to force a Review App to be deployed regardless of your changes, you can add the `pipeline:run-review-app` label to the merge request.
+Consult the [Review Apps](../testing_guide/review_apps.md) dedicated page for more information.
 
 ### As-if-FOSS jobs
 
@@ -380,13 +400,13 @@ fail.
 
 The `rspec:undercoverage` job has [known bugs](https://gitlab.com/groups/gitlab-org/-/epics/8254)
 that can cause false positive failures. You can test coverage locally to determine if it's
-safe to apply `~"pipeline:skip-undercoverage"`. For example, using `<spec>` as the name of the
+safe to apply `pipeline:skip-undercoverage`. For example, using `<spec>` as the name of the
 test causing the failure:
 
 1. Run `SIMPLECOV=1 bundle exec rspec <spec>`.
 1. Run `scripts/undercoverage`.
 
-If these commands return `undercover: ✅ No coverage is missing in latest changes` then you can apply `~"pipeline:skip-undercoverage"` to bypass pipeline failures.
+If these commands return `undercover: ✅ No coverage is missing in latest changes` then you can apply `pipeline:skip-undercoverage` to bypass pipeline failures.
 
 ## Test suite parallelization
 
@@ -416,7 +436,7 @@ After that, the next pipeline uses the up-to-date `knapsack/report-master.json`
 ### Automatic skipping of flaky tests
 
 Tests that are [known to be flaky](../testing_guide/flaky_tests.md#automatic-retries-and-flaky-tests-detection) are
-skipped unless the `$SKIP_FLAKY_TESTS_AUTOMATICALLY` variable is set to `false` or if the `~"pipeline:run-flaky-tests"`
+skipped unless the `$SKIP_FLAKY_TESTS_AUTOMATICALLY` variable is set to `false` or if the `pipeline:run-flaky-tests`
 label is set on the MR.
 
 See the [experiment issue](https://gitlab.com/gitlab-org/quality/team-tasks/-/issues/1069).
diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md
index 04fd36079ec..bca74d16f91 100644
--- a/doc/integration/jira/connect-app.md
+++ b/doc/integration/jira/connect-app.md
@@ -4,36 +4,36 @@ group: Integrations
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# GitLab.com for Jira Cloud app **(FREE)**
+# GitLab for Jira Cloud app **(FREE)**
 
 You can integrate GitLab and Jira Cloud using the
-[GitLab.com for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud)
+[GitLab for Jira Cloud](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud)
 app in the Atlassian Marketplace.
 
 Only Jira users with administrator access can install or configure
-the GitLab.com for Jira Cloud app.
+the GitLab for Jira Cloud app.
 
-## Install the GitLab.com for Jira Cloud app **(FREE SAAS)**
+## Install the GitLab for Jira Cloud app **(FREE SAAS)**
 
-If you use GitLab.com and Jira Cloud, you can install the GitLab.com for Jira Cloud app.
+If you use GitLab.com and Jira Cloud, you can install the GitLab for Jira Cloud app.
 If you do not use both of these environments, use the [Jira DVCS Connector](dvcs/index.md) or
-[install the GitLab.com for Jira Cloud app manually](#install-the-gitlabcom-for-jira-cloud-app-manually).
-We recommend the GitLab.com for Jira Cloud app, because data is
+[install the GitLab for Jira Cloud app manually](#install-the-gitlab-for-jira-cloud-app-manually).
+We recommend the GitLab for Jira Cloud app, because data is
 synchronized in real time. The DVCS connector updates data only once per hour.
 
-To configure the GitLab.com for Jira Cloud app, you must have
+To configure the GitLab for Jira Cloud app, you must have
 at least the Maintainer role in the GitLab.com namespace.
 
 This integration method supports [Smart Commits](dvcs/index.md#smart-commits).
 
 <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
-For a walkthrough of the integration with GitLab.com for Jira Cloud app, watch
+For a walkthrough of the integration with GitLab for Jira Cloud app, watch
 [Configure GitLab.com Jira Could Integration using Marketplace App](https://youtu.be/SwR-g1s1zTo) on YouTube.
 
-To install the GitLab.com for Jira Cloud app:
+To install the GitLab for Jira Cloud app:
 
 1. In Jira, go to **Jira Settings > Apps > Find new apps**, then search for GitLab.
-1. Select **GitLab.com for Jira Cloud**, then select **Get it now**, or go to the
+1. Select **GitLab for Jira Cloud**, then select **Get it now**, or go to the
    [App in the marketplace directly](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud).
 
    ![Install GitLab.com app on Jira Cloud](img/jira_dev_panel_setup_com_1.png)
@@ -44,14 +44,14 @@ To install the GitLab.com for Jira Cloud app:
 1. To add namespaces, ensure you're signed in to GitLab.com
    as a user with at least the Maintainer role.
 
-   ![Sign in to GitLab.com in GitLab.com for Jira Cloud app](img/jira_dev_panel_setup_com_3_v13_9.png)
+   ![Sign in to GitLab.com in GitLab for Jira Cloud app](img/jira_dev_panel_setup_com_3_v13_9.png)
 1. To open the list of available namespaces, select **Add namespace**.
 
 1. Identify the namespace you want to link, and select **Link**.
    - You must have at least the Maintainer role for the namespace.
    - Only Jira site administrators can add or remove namespaces for an installation.
 
-   ![Link namespace in GitLab.com for Jira Cloud app](img/jira_dev_panel_setup_com_4_v13_9.png)
+   ![Link namespace in GitLab for Jira Cloud app](img/jira_dev_panel_setup_com_4_v13_9.png)
 
 NOTE:
 The GitLab.com user only needs access when adding a new namespace. For syncing with
@@ -65,7 +65,7 @@ After a namespace is added:
 
 Support for syncing past branch and commit data is tracked [in this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/263240).
 
-## Update the GitLab.com for Jira Cloud app
+## Update the GitLab for Jira Cloud app
 
 Most updates to the app are fully automated and don't require any user interaction. See the
 [Atlassian Marketplace documentation](https://developer.atlassian.com/platform/marketplace/upgrading-and-versioning-cloud-apps/)
@@ -75,13 +75,13 @@ If the app requires additional permissions, [the update must first be manually a
 
 ## Set up OAuth authentication
 
-The GitLab.com for Jira Cloud app is [switching to OAuth authentication](https://gitlab.com/gitlab-org/gitlab/-/issues/387299).
+The GitLab for Jira Cloud app is [switching to OAuth authentication](https://gitlab.com/gitlab-org/gitlab/-/issues/387299).
 To enable OAuth authentication, you must create an OAuth application on the GitLab instance.
 
 Enabling OAuth authentication is:
 
-- Required to [connect the GitLab.com for Jira Cloud app for self-managed instances](#connect-the-gitlabcom-for-jira-cloud-app-for-self-managed-instances).
-- Recommended to [install the GitLab.com for Jira Cloud app manually](#install-the-gitlabcom-for-jira-cloud-app-manually).
+- Required to [connect the GitLab for Jira Cloud app for self-managed instances](#connect-the-gitlab-for-jira-cloud-app-for-self-managed-instances).
+- Recommended to [install the GitLab for Jira Cloud app manually](#install-the-gitlab-for-jira-cloud-app-manually).
 
 To create an OAuth application:
 
@@ -103,7 +103,7 @@ To create an OAuth application:
 1. Select **Save changes**.
 1. Optional. Enable the `jira_connect_oauth` [feature flag](../../administration/feature_flags.md) to avoid [authentication problems in some browsers](#browser-displays-a-sign-in-message-when-already-signed-in).
 
-## Connect the GitLab.com for Jira Cloud app for self-managed instances **(FREE SELF)**
+## Connect the GitLab for Jira Cloud app for self-managed instances **(FREE SELF)**
 
 > Introduced in GitLab 15.7.
 
@@ -113,17 +113,17 @@ Prerequisites:
 - The instance must be publicly available.
 - The instance must be on version 15.7 or later.
 
-You can link self-managed instances after installing the GitLab.com for Jira Cloud app from the marketplace.
+You can link self-managed instances after installing the GitLab for Jira Cloud app from the marketplace.
 Jira apps can only link to one URL per marketplace listing. The official listing links to GitLab.com.
 
 If your instance doesn't meet the prerequisites or you don't want to use the official marketplace listing, you can
-[install the app manually](#install-the-gitlabcom-for-jira-cloud-app-manually).
+[install the app manually](#install-the-gitlab-for-jira-cloud-app-manually).
 
 It's not possible to create branches from Jira for self-managed instances.
 
 ### Set up your instance
 
-To set up your self-managed instance for the GitLab.com for Jira Cloud app in GitLab 15.7 and later:
+To set up your self-managed instance for the GitLab for Jira Cloud app in GitLab 15.7 and later:
 
 1. [Set up OAuth authentication](#set-up-oauth-authentication).
 1. On the top bar, select **Main menu > Admin**.
@@ -134,14 +134,14 @@ To set up your self-managed instance for the GitLab.com for Jira Cloud app in Gi
 
 ### Link your instance
 
-To link your self-managed instance to the GitLab.com for Jira Cloud app:
+To link your self-managed instance to the GitLab for Jira Cloud app:
 
-1. Install the [GitLab.com for Jira Cloud app](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?tab=overview&hosting=cloud).
+1. Install the [GitLab for Jira Cloud app](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?tab=overview&hosting=cloud).
 1. Select **GitLab (self-managed)**.
 1. Enter your GitLab instance URL.
 1. Select **Save**.
 
-## Install the GitLab.com for Jira Cloud app manually **(FREE SELF)**
+## Install the GitLab for Jira Cloud app manually **(FREE SELF)**
 
 If your GitLab instance is self-managed and you don't want to use the official marketplace listing,
 you can install the app manually.
@@ -187,7 +187,7 @@ from outside the Marketplace, which allows you to install the application:
 
 1. Disable [development mode](https://developer.atlassian.com/cloud/jira/platform/getting-started-with-connect/#step-2--enable-development-mode) on your Jira instance.
 
-The **GitLab.com for Jira Cloud** app now displays under **Manage apps**. You can also
+The **GitLab for Jira Cloud** app now displays under **Manage apps**. You can also
 select **Get started** to open the configuration page rendered from your GitLab instance.
 
 NOTE:
@@ -211,7 +211,7 @@ To create a Marketplace listing:
 1. Generate test license tokens for your application.
 
 NOTE:
-This method uses [automated updates](#update-the-gitlabcom-for-jira-cloud-app)
+This method uses [automated updates](#update-the-gitlab-for-jira-cloud-app)
 the same way as our GitLab.com Marketplace listing.
 
 ## Troubleshooting
@@ -225,14 +225,14 @@ when you're already signed in:
 You need to sign in or sign up before continuing.
 ```
 
-The GitLab.com for Jira Cloud app uses an iframe to add namespaces on the
+The GitLab for Jira Cloud app uses an iframe to add namespaces on the
 settings page. Some browsers block cross-site cookies, which can lead to this issue.
 
 To resolve this issue, set up [OAuth authentication](#set-up-oauth-authentication) and enable the `jira_connect_oauth` [feature flag](../../administration/feature_flags.md).
 
 ### Manual installation fails
 
-You might get an error if you have installed the GitLab.com for Jira Cloud app from the official marketplace listing and replaced it with manual installation. To resolve this issue, disable the **Jira Connect Proxy URL** setting.
+You might get an error if you have installed the GitLab for Jira Cloud app from the official marketplace listing and replaced it with manual installation. To resolve this issue, disable the **Jira Connect Proxy URL** setting.
 
 - In GitLab 15.7:
 
diff --git a/doc/integration/jira/development_panel.md b/doc/integration/jira/development_panel.md
index 8fee11f8509..f72b714550c 100644
--- a/doc/integration/jira/development_panel.md
+++ b/doc/integration/jira/development_panel.md
@@ -69,7 +69,7 @@ To simplify administration, we recommend that a GitLab group maintainer or group
 
 | Jira usage | GitLab.com customers need | GitLab self-managed customers need |
 |------------|---------------------------|------------------------------------|
-| [Atlassian cloud](https://www.atlassian.com/migration/assess/why-cloud) | The [GitLab.com for Jira Cloud app](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview) from the [Atlassian Marketplace](https://marketplace.atlassian.com). This method offers real-time sync between GitLab.com and Jira. For more information, see [GitLab.com for Jira Cloud app](connect-app.md). | The GitLab.com for Jira Cloud app [installed manually](connect-app.md#install-the-gitlabcom-for-jira-cloud-app-manually). By default, you can install the app from the [Atlassian Marketplace](https://marketplace.atlassian.com/). For more information, see [Connect the GitLab.com for Jira Cloud app for self-managed instances](connect-app.md#connect-the-gitlabcom-for-jira-cloud-app-for-self-managed-instances). |
+| [Atlassian cloud](https://www.atlassian.com/migration/assess/why-cloud) | The [GitLab for Jira Cloud app](https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud?hosting=cloud&tab=overview) from the [Atlassian Marketplace](https://marketplace.atlassian.com). This method offers real-time sync between GitLab.com and Jira. For more information, see [GitLab for Jira Cloud app](connect-app.md). | The GitLab for Jira Cloud app [installed manually](connect-app.md#install-the-gitlab-for-jira-cloud-app-manually). By default, you can install the app from the [Atlassian Marketplace](https://marketplace.atlassian.com/). For more information, see [Connect the GitLab for Jira Cloud app for self-managed instances](connect-app.md#connect-the-gitlab-for-jira-cloud-app-for-self-managed-instances). |
 | Your own server | The [Jira DVCS (distributed version control system) connector](dvcs/index.md). This syncs data hourly. | The [Jira DVCS (distributed version control system) connector](dvcs/index.md). This syncs data hourly. |
 
 Each GitLab project can be configured to connect to an entire Jira instance. That means after
diff --git a/doc/integration/jira/dvcs/index.md b/doc/integration/jira/dvcs/index.md
index 1fa96e20d01..6659c0163cc 100644
--- a/doc/integration/jira/dvcs/index.md
+++ b/doc/integration/jira/dvcs/index.md
@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 Use the Jira DVCS (distributed version control system) connector if you self-host
 your Jira instance, and you want to sync information
 between GitLab and Jira. If you use Jira Cloud, you should use the
-[GitLab.com for Jira Cloud app](../connect-app.md) unless you specifically need the
+[GitLab for Jira Cloud app](../connect-app.md) unless you specifically need the
 DVCS connector.
 
 When you configure the Jira DVCS connector, make sure your GitLab and Jira instances
diff --git a/doc/integration/jira/index.md b/doc/integration/jira/index.md
index 9307eeb5b5f..0bec7e7cec9 100644
--- a/doc/integration/jira/index.md
+++ b/doc/integration/jira/index.md
@@ -35,7 +35,7 @@ connects all GitLab projects under a group or personal namespace. When configure
 relevant GitLab information, including related branches, commits, and merge requests,
 displays in the [development panel](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/).
 
-To set up the Jira development panel integration, use the GitLab.com for Jira Cloud app
+To set up the Jira development panel integration, use the GitLab for Jira Cloud app
 or the Jira DVCS (distributed version control system) connector,
 [depending on your installation](development_panel.md#configure-the-integration).
 
@@ -73,7 +73,7 @@ If you integrate a private GitLab project with Jira, the private data is
 shared with users who have access to your Jira project.
 
 The [**Jira project integration**](#jira-integration) posts GitLab data in the form of comments in Jira issues.
-The GitLab.com for Jira Cloud app and Jira DVCS connector share this data through the [**Jira Development Panel**](development_panel.md).
+The GitLab for Jira Cloud app and Jira DVCS connector share this data through the [**Jira Development Panel**](development_panel.md).
 This method provides more fine-grained access control because access can be restricted to certain user groups or roles.
 
 ## Third-party Jira integrations
diff --git a/doc/operations/incident_management/alerts.md b/doc/operations/incident_management/alerts.md
index d42ee237749..6d6fde45de7 100644
--- a/doc/operations/incident_management/alerts.md
+++ b/doc/operations/incident_management/alerts.md
@@ -35,7 +35,7 @@ The alert list displays the following information:
   - **Triggered**: Investigation has not started.
   - **Acknowledged**: Someone is actively investigating the problem.
   - **Resolved**: No further work is required.
-  - **Ignored**: No action will be taken on the alert.
+  - **Ignored**: No action is taken on the alert.
 
 ## Alert severity
 
diff --git a/doc/operations/metrics/dashboards/index.md b/doc/operations/metrics/dashboards/index.md
index aef9bcb4b22..9d5641bd800 100644
--- a/doc/operations/metrics/dashboards/index.md
+++ b/doc/operations/metrics/dashboards/index.md
@@ -190,7 +190,7 @@ Related links can contain the following attributes:
 - `title`: A phrase describing the link. Optional. If this attribute is not set,
   the full URL is used for the link title.
 - `type`: A string declaring the type of link. Optional. If set to `grafana`, the
-  dashboard's time range values are converted to Grafana's time range format and
+  dashboard's time range values are converted to the Grafana time range format and
   appended to the `url`.
 
 The dashboard's time range is appended to the `url` as URL parameters.
diff --git a/doc/subscriptions/quarterly_reconciliation.md b/doc/subscriptions/quarterly_reconciliation.md
index 508dd2924e3..2b45d145aaf 100644
--- a/doc/subscriptions/quarterly_reconciliation.md
+++ b/doc/subscriptions/quarterly_reconciliation.md
@@ -34,12 +34,12 @@ and for only the remaining quarters.
 
 Using the same example, if a seat is $100 per year, then it is $25 per quarter.
 
-- In Q1, you had a maximum of 110 users. 10 users over license x $25 per user x 3 quarters = **$750**
+- In Q1, you had a maximum of 110 users. 10 users over subscription x $25 per user x 3 quarters = **$750**
   The license is now paid for 110 users.
 
 - In Q2, 105 users was the maximum. You did not go over 110 users, so no charge.
 
-- In Q3, you had 120 users. 10 users over license x $25 per user x 1 remaining quarter = **$250**
+- In Q3, you had 120 users. 10 users over subscription x $25 per user x 1 remaining quarter = **$250**
   The license is now paid for 120 users.
 
 - In Q4, you had 120 users. You did not exceed the number of users. However, if you had, you would not be charged, because in Q4, there are no charges for exceeding the number.
@@ -71,7 +71,7 @@ sent and subject to your terms.
 ### Self-managed instances
 
 Administrators receive an email **six days after the reconciliation date**.
-This email communicates the [overage seat quantity](self_managed/index.md#users-over-license)
+This email communicates the [overage seat quantity](self_managed/index.md#users-over-subscription)
 and expected invoice amount.
 
 **Seven days later**, the subscription is updated to include the additional
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index 389bad87844..e3d6630c85b 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -46,7 +46,7 @@ according to the [maximum number](#maximum-users) of users enabled during the su
 For instances that aren't offline or on a closed network, the maximum number of
 simultaneous users in the GitLab self-managed installation is checked each quarter.
 
-If an instance is unable to generate a quarterly usage report, the existing [true up model](#users-over-license) is used.
+If an instance is unable to generate a quarterly usage report, the existing [true up model](#users-over-subscription) is used.
 Prorated charges are not possible without a quarterly usage report.
 
 ### View user totals
@@ -82,20 +82,20 @@ billable user, with the following exceptions:
 
 The number of _maximum users_ reflects the highest number of billable users for the current license period.
 
-#### Users over license
+#### Users over subscription
 
-The number of _users over license_ shows how many users are in excess of the number allowed by the license. This number reflects the current license period.
+The number of _users over subscription_ shows how many users are in excess of the number allowed by the subscription. This number reflects the current subscription period.
 
 For example, if:
 
-- The license allows 100 users and
+- The subscription allows 100 users and
 - **Maximum users** is 150,
 
 Then this value would be 50.
 
 If the **Maximum users** value is less than or equal to 100, then this value is 0.
 
-A trial license always displays zero for **Users over license**.
+A trial license always displays zero for **Users over subscription**.
 
 If you add more users to your GitLab instance than you are licensed for, payment for the additional users is due [at the time of renewal](../quarterly_reconciliation.md).
 
@@ -269,7 +269,7 @@ It also displays the following information:
 | Users in License   | The number of users you've paid for in the current license loaded on the system. The number does not change unless you [add seats](#add-seats-to-a-subscription) during your current subscription period. |
 | Billable users     | The daily count of billable users on your system. The count may change as you block, deactivate, or add users to your instance. |
 | Maximum users      | The highest number of billable users on your system during the term of the loaded license. |
-| Users over license | Calculated as `Maximum users` - `Users in License` for the current license term. This number incurs a retroactive charge that must be paid before renewal. |
+| Users over subscription | Calculated as `Maximum users` - `Users in subscription` for the current license term. This number incurs a retroactive charge that must be paid before renewal. |
 
 ## Export your license usage
 
@@ -327,18 +327,18 @@ It's important to regularly review your user accounts, because:
   if you renew for too many users.
 - Stale user accounts can be a security risk. A regular review helps reduce this risk.
 
-#### Users over License
+#### Users over subscription
 
-A GitLab subscription is valid for a specific number of seats. The number of users over license
-is the number of _Maximum users_ that exceed the _Users in License_ for the current license term.
+A GitLab subscription is valid for a specific number of seats. The number of users over subscription
+is the number of _maximum users_ that exceed the users in subscription for the current subscription term.
 You must pay for this number of users either before renewal, or at the time of renewal. This is
-known as the _true up_ process.
+called the _true up_ process.
 
-To view the number of _users over license_ go to the **Admin Area**.
+To view the number of users over subscription go to the **Admin Area**.
 
-##### Users over license example
+##### Users over subscription example
 
-You purchase a license for 10 users.
+You purchase a subscription for 10 users.
 
 | Event                                              | Billable users | Maximum users |
 |:---------------------------------------------------|:-----------------|:--------------|
@@ -346,7 +346,7 @@ You purchase a license for 10 users.
 | Two new users join.                                | 12               | 12            |
 | Three users leave and their accounts are removed.  | 9                | 12            |
 
-Users over license = 12 - 10 (Maximum users - users in license)
+Users over subscription = 12 - 10 (Maximum users - users in license)
 
 ### Add seats to a subscription
 
@@ -387,7 +387,7 @@ You can hover your mouse on the **Renew** button to see the date when it will be
    If you need to change your [GitLab tier](https://about.gitlab.com/pricing/), contact our sales team with [the sales contact form](https://about.gitlab.com/sales/) for assistance as this can't be done in the Customers Portal.
 
 1. In the first box, enter the total number of user licenses you'll need for the upcoming year. Be sure this number is at least **equal to, or greater than** the number of billable users in the system at the time of performing the renewal.
-1. Enter the number of [users over license](#users-over-license) in the second box for the user overage incurred in your previous subscription term.
+1. Enter the number of [users over subscription](#users-over-subscription) in the second box for the user overage incurred in your previous subscription term.
 1. Review your renewal details and complete the payment process.
 1. An activation code for the renewal term is available on the [Manage Purchases](https://customers.gitlab.com/subscriptions) page on the relevant subscription card. Select **Copy activation code** to get a copy.
 1. [Add the activation code](../../user/admin_area/license.md) to your instance.
diff --git a/doc/user/application_security/dast/authentication.md b/doc/user/application_security/dast/authentication.md
index de3bdad3c42..77732ab532c 100644
--- a/doc/user/application_security/dast/authentication.md
+++ b/doc/user/application_security/dast/authentication.md
@@ -48,8 +48,8 @@ To run a DAST authenticated scan:
 - You are using either the [DAST proxy-based analyzer](proxy-based.md) or the [DAST browser-based analyzer](browser_based.md).
 - You know the URL of the login form of your application. Alternatively, you know how to navigate to the login form from the authentication URL (see [clicking to navigate to the login form](#clicking-to-navigate-to-the-login-form)).
 - You have the username and password of the user you would like to authenticate as during the scan.
-- You know the [selectors](#finding-an-elements-selector) of the username and password HTML fields that DAST will use to input the respective values.
-- You know the element's [selector](#finding-an-elements-selector) that will submit the login form when selected.
+- You know the [selectors](#finding-an-elements-selector) of the username and password HTML fields that DAST uses to input the respective values.
+- You know the element's [selector](#finding-an-elements-selector) that submits the login form when selected.
 - You have thought about how you can [verify](#verifying-authentication-is-successful) whether or not authentication was successful.
 - You have checked the [known limitations](#known-limitations) to ensure DAST can authenticate to your application.
 
@@ -144,7 +144,7 @@ See [Custom CI/CI variables](../../../ci/variables/index.md#for-a-project) for m
 
 ### Configuration for Single Sign-On (SSO)
 
-If a user can log into an application, then in most cases, DAST will also be able to log in.
+If a user can log into an application, then in most cases, DAST is also able to log in.
 This is the case even when an application uses Single Sign-on. Applications using SSO solutions should configure DAST
 authentication using the [single-step](#configuration-for-a-single-step-login-form) or [multi-step](#configuration-for-a-multi-step-login-form) login form configuration guides.
 
@@ -172,8 +172,8 @@ dast:
 
 ### Excluding logout URLs
 
-If DAST crawls the logout URL while running an authenticated scan, the user will be logged out, resulting in the remainder of the scan being unauthenticated.
-It is therefore recommended to exclude logout URLs using the CI/CD variable `DAST_EXCLUDE_URLS`. DAST will not access any excluded URLs, ensuring the user remains logged in.
+If DAST crawls the logout URL while running an authenticated scan, the user is logged out, resulting in the remainder of the scan being unauthenticated.
+It is therefore recommended to exclude logout URLs using the CI/CD variable `DAST_EXCLUDE_URLS`. DAST isn't accessing any excluded URLs, ensuring the user remains logged in.
 
 Provided URLs can be either absolute URLs, or regular expressions of URL paths relative to the base path of the `DAST_WEBSITE`. For example:
 
@@ -197,7 +197,7 @@ Selectors have the format `type`:`search string`. DAST searches for the selector
 | `css`         | `css:.password-field`              | Searches for a HTML element having the supplied CSS selector. Selectors should be as specific as possible for performance reasons.                                                                    |
 | `id`          | `id:element`                       | Searches for an HTML element with the provided element ID.                                                                                                                                            |
 | `name`        | `name:element`                     | Searches for an HTML element with the provided element name.                                                                                                                                          |
-| `xpath`       | `xpath://input[@id="my-button"]/a` | Searches for a HTML element with the provided XPath. Note that XPath searches are expected to be less performant than other searches.                                                                 |
+| `xpath`       | `xpath://input[@id="my-button"]/a` | Searches for a HTML element with the provided XPath. XPath searches are expected to be less performant than other searches.                                                                           |
 | None provided | `a.click-me`                       | Defaults to searching using a CSS selector. **{warning}** **[Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/383348)** in GitLab 15.8. Replaced by explicitly declaring the selector type.  |
 
 #### Find selectors with Google Chrome
@@ -238,7 +238,7 @@ When using selectors to locate specific fields we recommend you avoid searching
 ## Verifying authentication is successful
 
 Once DAST has submitted the login form, a verification process takes place
-to determine if authentication succeeded. The scan will halt with an error if authentication is unsuccessful.
+to determine if authentication succeeded. The scan halts with an error if authentication is unsuccessful.
 
 Following the submission of the login form, authentication is determined to be unsuccessful when:
 
@@ -251,13 +251,13 @@ Following the submission of the login form, authentication is determined to be u
 Verification checks run checks on the state of the browser once authentication is complete
 to determine further if authentication succeeded.
 
-DAST will test for the absence of a login form if no verification checks are configured.
+DAST tests for the absence of a login form if no verification checks are configured.
 
 #### Verify based on the URL
 
 Define `DAST_AUTH_VERIFICATION_URL` as the URL displayed in the browser tab once the login form is successfully submitted.
 
-DAST will compare the verification URL to the URL in the browser after authentication.
+DAST compares the verification URL to the URL in the browser after authentication.
 If they are not the same, authentication is unsuccessful.
 
 For example:
@@ -274,7 +274,7 @@ dast:
 
 #### Verify based on presence of an element
 
-Define `DAST_AUTH_VERIFICATION_SELECTOR` as a [selector](#finding-an-elements-selector) that will find one or many elements on the page
+Define `DAST_AUTH_VERIFICATION_SELECTOR` as a [selector](#finding-an-elements-selector) that finds one or many elements on the page
 displayed once the login form is successfully submitted. If no element is found, authentication is unsuccessful.
 Searching for the selector on the page displayed when login fails should return no elements.
 
@@ -337,8 +337,8 @@ dast:
 
 ## Known limitations
 
-- DAST cannot bypass a CAPTCHA if the authentication flow includes one. Please turn these off in the testing environment for the application being scanned.
-- DAST cannot handle multi-factor authentication like one-time passwords (OTP) by using SMS, biometrics, or authenticator apps. Please turn these off in the testing environment for the application being scanned.
+- DAST cannot bypass a CAPTCHA if the authentication flow includes one. Turn these off in the testing environment for the application being scanned.
+- DAST cannot handle multi-factor authentication like one-time passwords (OTP) by using SMS, biometrics, or authenticator apps. Turn these off in the testing environment for the application being scanned.
 - DAST cannot authenticate to applications that do not set an [authentication token](#authentication-tokens) during login.
 - DAST cannot authenticate to applications that require more than two inputs to be filled out. Two inputs must be supplied, username and password.
 
diff --git a/doc/user/project/code_owners.md b/doc/user/project/code_owners.md
index 8ae3715f3bf..9de9d445965 100644
--- a/doc/user/project/code_owners.md
+++ b/doc/user/project/code_owners.md
@@ -15,6 +15,15 @@ files or directories in a repository.
 - You can set your merge requests so they must be approved by Code Owners before merge.
 - You can protect a branch and allow only Code Owners to approve changes to the branch.
 
+<div class="video-fallback">
+  Video introduction: <a href="https://www.youtube.com/watch?v=RoyBySTUSB0">Code Owners</a>.
+</div>
+<figure class="video-container">
+  <iframe src="https://www.youtube-nocookie.com/embed/RoyBySTUSB0" frameborder="0" allowfullscreen> </iframe>
+</figure>
+
+<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
+
 Use Code Owners and approvers together with
 [approval rules](merge_requests/approvals/rules.md) to build a flexible approval
 workflow: