From cbc0ad4c3144e0c7ef9654fde65bf53e552fd953 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 28 Dec 2021 03:14:28 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .markdownlint.yml | 2 ++ .../testing_guide/end_to_end/rspec_metadata_tests.md | 2 +- doc/raketasks/backup_restore.md | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.markdownlint.yml b/.markdownlint.yml index bb4c859e197..a2259618d8a 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -103,6 +103,7 @@ proper-names: "OpenID", "OpenShift", "PgBouncer", + "Postfix", "PostgreSQL", "Praefect", "Prometheus", @@ -117,6 +118,7 @@ proper-names: "runit", "Salesforce", "SAML", + "Sendmail", "Sentry", "Sidekiq", "Shibboleth", 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 index 3e1f75c3f78..bb214976926 100644 --- a/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md +++ b/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md @@ -46,4 +46,4 @@ This is a partial list of the [RSpec metadata](https://relishapp.com/rspec/rspec | `:smtp` | The test requires a GitLab instance to be configured to use an SMTP server. Tests SMTP notification email delivery from GitLab by using MailHog. | | `:testcase` | The link to the test case issue in the [GitLab Project Test Cases](https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases). | | `:transient` | The test tests transient bugs. It is excluded by default. | -| `:issue`, `:issue_${num}` | Optional links to issues which might be related to the spec. Helps keeping track of related issues and can also be used by tools that create test reports. Currently added automatically to `Allure` test report. Multiple tags can be used by adding optional number postfix like `issue_1`, `issue_2` etc. | +| `:issue`, `:issue_${num}` | Optional links to issues which might be related to the spec. Helps keep track of related issues and can also be used by tools that create test reports. Currently added automatically to `Allure` test report. Multiple tags can be used by adding an optional numeric suffix like `issue_1`, `issue_2` etc. | diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index 380541ab189..5b32397eadc 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -58,7 +58,7 @@ including: - CI/CD job output logs - CI/CD job artifacts - LFS objects -- Terraform states +- Terraform states ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/331806) in GitLab 14.7) - Container Registry images - GitLab Pages content - Snippets