Add latest changes from gitlab-org/gitlab@master

3 files changed, 16 insertions, 1 deletions

diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index ec0e5df6a92..1454f91ac20 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -91,7 +91,8 @@ and are as follows:
 1. For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
 1. For tags, create a pipeline.
 1. If `$GITLAB_INTERNAL` isn't set, don't create a pipeline.
-   1. For stable, auto-deploy, and security branches, create a pipeline.
+1. For stable, auto-deploy, and security branches, create a pipeline.
+1. For any other cases (e.g. when pushing a branch with no MR for it), no pipeline is created.
 
 ## `rules`, `if:` conditions and `changes:` patterns
 
diff --git a/doc/development/testing_guide/end_to_end/index.md b/doc/development/testing_guide/end_to_end/index.md
index 65ee2b0a759..d701af20ec3 100644
--- a/doc/development/testing_guide/end_to_end/index.md
+++ b/doc/development/testing_guide/end_to_end/index.md
@@ -183,6 +183,7 @@ Continued reading:
 - [Best Practices](best_practices.md)
 - [Testing with feature flags](feature_flags.md)
 - [Flows](flows.md)
+- [RSpec metadata/tags](rspec_metadata_tests.md)
 
 ## Where can I ask for help?
 
diff --git a/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md b/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md
new file mode 100644
index 00000000000..abc7c88b4f2
--- /dev/null
+++ b/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md
@@ -0,0 +1,13 @@
+# RSpec metadata for end-to-end tests
+
+This is a partial list of the [RSpec metadata](https://relishapp.com/rspec/rspec-core/docs/metadata/user-defined-metadata)
+(a.k.a. tags) that are used in our end-to-end tests.
+
+<!-- Please keep the tags in alphabetical order -->
+
+| Tag | Description |
+|-|-|
+| `:elasticsearch` | The test requires an Elasticsearch service. It is used by the [instance-level scenario](https://gitlab.com/gitlab-org/gitlab-qa#definitions) [`Test::Integration::Elasticsearch`](https://gitlab.com/gitlab-org/gitlab/-/blob/72b62b51bdf513e2936301cb6c7c91ec27c35b4d/qa/qa/ee/scenario/test/integration/elasticsearch.rb) to include only tests that require Elasticsearch. |
+| `:orchestrated` | The GitLab instance under test may be [configured by `gitlab-qa`](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/docs/what_tests_can_be_run.md#orchestrated-tests) to be different to the default GitLab configuration, or `gitlab-qa` may launch additional services in separate docker containers, or both. Tests tagged with `:orchestrated` are excluded when testing environments where we can't dynamically modify GitLab's configuration (for example, Staging). |
+| `:quarantine` | The test has been [quarantined](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantining-tests), will run in a separate job that only includes quarantined tests, and is allowed to fail. The test will be skipped in its regular job so that if it fails it will not hold up the pipeline. |
+| `:requires_admin` | The test requires an admin account. Tests with the tag are excluded when run against Canary and Production environments. |