From 526f1e98593d1d5691df5de18862f31dd08c4889 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 6 Jul 2022 15:08:08 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/development/pipelines.md | 13 +++++++++++++ .../metrics/img/prometheus_integration_alerts.png | Bin 16084 -> 0 bytes .../issues/img/turn_off_confidentiality_v15_0.png | Bin 10137 -> 0 bytes .../issues/img/turn_on_confidentiality_v15_0.png | Bin 7550 -> 0 bytes doc/user/project/settings/img/cve_id_request_toggle.png | Bin 5395 -> 0 bytes 5 files changed, 13 insertions(+) delete mode 100644 doc/operations/metrics/img/prometheus_integration_alerts.png delete mode 100644 doc/user/project/issues/img/turn_off_confidentiality_v15_0.png delete mode 100644 doc/user/project/issues/img/turn_on_confidentiality_v15_0.png delete mode 100644 doc/user/project/settings/img/cve_id_request_toggle.png (limited to 'doc') diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md index e222997df31..2bf1e5a315a 100644 --- a/doc/development/pipelines.md +++ b/doc/development/pipelines.md @@ -275,6 +275,19 @@ rather than from the default branch `main-jh`. NOTE: For now, CI will try to fetch the branch on the [GitLab JH mirror](https://gitlab.com/gitlab-org/gitlab-jh-mirrors/gitlab), so it might take some time for the new JH branch to propagate to the mirror. +## Ruby 3.0 jobs + +You can add the `pipeline:run-in-ruby3` label to the merge request to switch +the Ruby version used for running the whole test suite to 3.0. When you do +this, the test suite will no longer run in Ruby 2.7 (default), and an +additional job `verify-ruby-2.7` will also run and always fail to remind us to +remove the label and run in Ruby 2.7 before merging the merge request. + +This should let us: + +- Test changes for Ruby 3.0 +- Make sure it will not break anything when it's merged into the default branch + ## `undercover` RSpec test > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74859) in GitLab 14.6. diff --git a/doc/operations/metrics/img/prometheus_integration_alerts.png b/doc/operations/metrics/img/prometheus_integration_alerts.png deleted file mode 100644 index 609c5e5196c..00000000000 Binary files a/doc/operations/metrics/img/prometheus_integration_alerts.png and /dev/null differ diff --git a/doc/user/project/issues/img/turn_off_confidentiality_v15_0.png b/doc/user/project/issues/img/turn_off_confidentiality_v15_0.png deleted file mode 100644 index 37cbe0f4fd9..00000000000 Binary files a/doc/user/project/issues/img/turn_off_confidentiality_v15_0.png and /dev/null differ diff --git a/doc/user/project/issues/img/turn_on_confidentiality_v15_0.png b/doc/user/project/issues/img/turn_on_confidentiality_v15_0.png deleted file mode 100644 index 498867d1933..00000000000 Binary files a/doc/user/project/issues/img/turn_on_confidentiality_v15_0.png and /dev/null differ diff --git a/doc/user/project/settings/img/cve_id_request_toggle.png b/doc/user/project/settings/img/cve_id_request_toggle.png deleted file mode 100644 index 53ec804922c..00000000000 Binary files a/doc/user/project/settings/img/cve_id_request_toggle.png and /dev/null differ -- cgit v1.2.3