Add latest changes from gitlab-org/gitlab@master

7 files changed, 12 insertions, 9 deletions

diff --git a/doc/ci/pipelines/settings.md b/doc/ci/pipelines/settings.md
index b48c62dccc5..94d7e317104 100644
--- a/doc/ci/pipelines/settings.md
+++ b/doc/ci/pipelines/settings.md
@@ -124,7 +124,7 @@ If the CI/CD configuration file is on an external site, the URL must end with `.
 
 If the CI/CD configuration file is in a different project:
 
-- The file must exist on its default branch.
+- The file must exist on its default branch, or specify the branch as refname.
 - The path must be relative to the root directory in the other project.
 - The path must include the group and project name at the end.
 
@@ -132,6 +132,7 @@ For example:
 
 - `.gitlab-ci.yml@mygroup/another-project`
 - `my/path/.my-custom-file.yml@mygroup/another-project`
+- `my/path/.my-custom-file.yml@mygroup/another-project:refname`
 
 If the configuration file is in a separate project, you can more set more granular permissions. For example:
 
diff --git a/doc/ci/services/gitlab.md b/doc/ci/services/gitlab.md
index 1258c33aa77..5ac66846ab7 100644
--- a/doc/ci/services/gitlab.md
+++ b/doc/ci/services/gitlab.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference
 ---
 
-# Use GitLab as a microservice
+# Use GitLab as a microservice **(FREE)**
 
 Many applications need to access JSON APIs, so application tests might need access
 to APIs too. The following example shows how to use GitLab as a microservice to give
diff --git a/doc/ci/services/index.md b/doc/ci/services/index.md
index d656b8fe651..4114833d1c8 100644
--- a/doc/ci/services/index.md
+++ b/doc/ci/services/index.md
@@ -6,7 +6,7 @@ comments: false
 type: index
 ---
 
-# Services
+# Services **(FREE)**
 
 The `services` keyword defines a Docker image that runs during a `job`
 linked to the Docker image that the image keyword defines. This allows
diff --git a/doc/ci/services/mysql.md b/doc/ci/services/mysql.md
index 3d9b93d3271..d0ac123ba62 100644
--- a/doc/ci/services/mysql.md
+++ b/doc/ci/services/mysql.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference
 ---
 
-# Using MySQL
+# Using MySQL **(FREE)**
 
 Many applications depend on MySQL as their database, and you may
 need it for your tests to run.
diff --git a/doc/ci/services/postgres.md b/doc/ci/services/postgres.md
index cf44b01b2b8..62838e04969 100644
--- a/doc/ci/services/postgres.md
+++ b/doc/ci/services/postgres.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference
 ---
 
-# Using PostgreSQL
+# Using PostgreSQL **(FREE)**
 
 As many applications depend on PostgreSQL as their database, you
 eventually need it in order for your tests to run. Below you are guided how to
diff --git a/doc/ci/services/redis.md b/doc/ci/services/redis.md
index d8c7b805864..a3446fc2677 100644
--- a/doc/ci/services/redis.md
+++ b/doc/ci/services/redis.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference
 ---
 
-# Using Redis
+# Using Redis **(FREE)**
 
 As many applications depend on Redis as their key-value store, you
 eventually need it in order for your tests to run. Below you are guided how to
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md
index 5164ebf6f17..b6af235cd60 100644
--- a/doc/ci/yaml/index.md
+++ b/doc/ci/yaml/index.md
@@ -1827,6 +1827,11 @@ rspec:
 
 ### `tags`
 
+> - A limit of 50 tags per job [enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/338929) in GitLab 14.3.
+> - A limit of 50 tags per job [enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/339855) in GitLab 14.3.
+
+In [GitLab 14.3](https://gitlab.com/gitlab-org/gitlab/-/issues/338479) and later, the number of tags must be less than `50`.
+
 Use `tags` to select a specific runner from the list of all runners that are
 available for the project.
 
@@ -1880,9 +1885,6 @@ variables:
       - echo "Hello runner selector feature"
 ```
 
-NOTE:
-In [GitLab 14.3 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/338479), the number of tags must be less than `50`.
-
 ### `allow_failure`
 
 Use `allow_failure` when you want to let a job fail without impacting the rest of the CI