Add latest changes from gitlab-org/gitlab@master

5 files changed, 15 insertions, 38 deletions

diff --git a/doc/ci/git_submodules.md b/doc/ci/git_submodules.md
index 68cbff21fae..ed94410e6f9 100644
--- a/doc/ci/git_submodules.md
+++ b/doc/ci/git_submodules.md
@@ -84,14 +84,6 @@ To make submodules work correctly in CI/CD jobs:
      GIT_SUBMODULE_UPDATE_FLAGS: --jobs 4
    ```
   
-1. You can set the [GIT_SUBMODULE_PATHS](runners/configure_runners.md#sync-or-exclude-specific-submodules-from-ci-jobs) to explicitly ignore submodules during cloning:
-
-   ```yaml
-   variables:
-    GIT_SUBMODULE_STRATEGY: recursive
-    GIT_SUBMODULE_PATHS: ':(exclude)submodule'
-   ```
-
 If you use the [`CI_JOB_TOKEN`](jobs/ci_job_token.md) to clone a submodule in a
 pipeline job, the user executing the job must be assigned to a role that has
 [permission](../user/permissions.md#gitlab-cicd-permissions) to trigger a pipeline
diff --git a/doc/ci/runners/configure_runners.md b/doc/ci/runners/configure_runners.md
index c675f7204ec..3757410e355 100644
--- a/doc/ci/runners/configure_runners.md
+++ b/doc/ci/runners/configure_runners.md
@@ -306,7 +306,6 @@ globally or for individual jobs:
 
 - [`GIT_STRATEGY`](#git-strategy)
 - [`GIT_SUBMODULE_STRATEGY`](#git-submodule-strategy)
-- [`GIT_SUBMODULE_PATHS`](#sync-or-exclude-specific-submodules-from-ci-jobs)
 - [`GIT_CHECKOUT`](#git-checkout)
 - [`GIT_CLEAN_FLAGS`](#git-clean-flags)
 - [`GIT_FETCH_EXTRA_FLAGS`](#git-fetch-extra-flags)
@@ -524,6 +523,12 @@ The path syntax is the same as [`git submodule`](https://git-scm.com/docs/git-su
       GIT_SUBMODULE_PATHS: :(exclude)submoduleA :(exclude)submoduleB
    ```
 
+WARNING:
+Git ignores nested paths. To ignore a nested submodule, exclude
+the parent submodule and then manually clone it in the job's scripts. For example,
+ `git clone <repo> --recurse-submodules=':(exclude)nested-submodule'`. Make sure
+to wrap the string in single quotes so the YAML can be parsed successfully.
+
 ### Git submodule update flags
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/3192) in GitLab Runner 14.8.
@@ -565,34 +570,6 @@ You should be aware of the implications for the security, stability, and reprodu
 your builds when using the `--remote` flag. In most cases, it is better to explicitly track
 submodule commits as designed, and update them using an auto-remediation/dependency bot.
 
-### Sync or exclude specific submodules from CI jobs
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/26495) in GitLab Runner 14.0.
-
-Some projects have a large number of submodules, and not all of them need to be
-synced or updated in all CI jobs. Use the `GIT_SUBMODULE_PATHS` variable to control this behavior.
-The path syntax is the same as [`git submodule`](https://git-scm.com/docs/git-submodule#Documentation/git-submodule.txt-ltpathgt82308203):
-
-- To sync and update specific paths:
-
-  ```yaml
-  variables:
-     GIT_SUBMODULE_PATHS: 'submoduleA'
-  ```
-
-- To exclude specific paths:
-
-  ```yaml
-  variables:
-     GIT_SUBMODULE_PATHS: ':(exclude)submoduleA'
-  ```
-
-WARNING:
-Git ignores nested and multiple submodule paths. To ignore a nested submodule, exclude
-the parent submodule and then manually clone it in the job's scripts. For example,
- `git clone <repo> --recurse-submodules=':(exclude)nested-submodule'`. Make sure
-to wrap the string in single quotes so the YAML can be parsed successfully.
-
 ### Shallow cloning
 
 > Introduced in GitLab 8.9 as an experimental feature.
diff --git a/doc/ci/variables/index.md b/doc/ci/variables/index.md
index 97707c603bd..d949fab2fc1 100644
--- a/doc/ci/variables/index.md
+++ b/doc/ci/variables/index.md
@@ -153,6 +153,8 @@ job:
 
 ### Add a CI/CD variable to a project
 
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/362227) in GitLab 15.7, projects can define a maximum of 200 CI/CD variables.
+
 You can add CI/CD variables to a project's settings. Only project members with the
 Maintainer role
 can add or update project CI/CD variables. To keep a CI/CD variable secret, put it
@@ -191,7 +193,8 @@ The output is:
 
 ### Add a CI/CD variable to a group
 
-> Support for environment scopes [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/2874) in GitLab Premium 13.11
+> - Support for environment scopes [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/2874) in GitLab Premium 13.11
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/362227) in GitLab 15.7, groups can define a maximum of 200 CI/CD variables.
 
 To make a CI/CD variable available to all projects in a group, define a group CI/CD variable. Only group owners can add or update group-level CI/CD variables.
 
diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md
index a0bdd9f9eb4..16394e31d15 100644
--- a/doc/development/testing_guide/best_practices.md
+++ b/doc/development/testing_guide/best_practices.md
@@ -431,6 +431,8 @@ results are available, and not just the first failure.
 You must set feature category metadata for each RSpec example. This information is used for flaky test
 issues to identify the group that owns the feature.
 
+The `feature_category` should be a value from [`categories.json`](https://about.gitlab.com/categories.json).
+
 The `feature_category` metadata can be set:
 
 - [In the top-level `RSpec.describe` blocks](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104274/diffs#6bd01173381e873f3e1b6c55d33cdaa3d897156b_5_5).
diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md
index 4851090c592..092b0dd0077 100644
--- a/doc/subscriptions/gitlab_com/index.md
+++ b/doc/subscriptions/gitlab_com/index.md
@@ -245,6 +245,9 @@ To change the namespace linked to a subscription:
 1. Select the desired group from the **This subscription is for** dropdown. For a group to appear here, you must have the Owner role for that group.
 1. Select **Proceed to checkout**.
 
+<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
+For a demo, see [Linking GitLab Subscription to the Namespace](https://youtu.be/qAq8pyFP-a0).
+
 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](#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.