diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-11 03:07:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-11 03:07:58 +0300 |
| commit | 946d6c5723db8448a541f663b0739ace7f5131d3 (patch) | |
| tree | 92a318ee65dbb52b77f2bf7b0cbf8f5b21c26a5f /.gitlab | |
| parent | ddfa6a1f19f1c6847d30314858f1d0ad21de13f9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
3 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab/issue_templates/Geo Replicate a new Git repository type.md b/.gitlab/issue_templates/Geo Replicate a new Git repository type.md index 97f756f0d02..eee989ed21e 100644 --- a/.gitlab/issue_templates/Geo Replicate a new Git repository type.md +++ b/.gitlab/issue_templates/Geo Replicate a new Git repository type.md @@ -517,7 +517,6 @@ That's all of the required database changes. module Geo class CoolWidgetState < ApplicationRecord - include EachBatch include ::Geo::VerificationStateDefinition self.primary_key = :cool_widget_id diff --git a/.gitlab/issue_templates/Geo Replicate a new blob type.md b/.gitlab/issue_templates/Geo Replicate a new blob type.md index 9dfc83309cc..88a7fad4975 100644 --- a/.gitlab/issue_templates/Geo Replicate a new blob type.md +++ b/.gitlab/issue_templates/Geo Replicate a new blob type.md @@ -482,7 +482,6 @@ That's all of the required database changes. module Geo class CoolWidgetState < ApplicationRecord - include EachBatch include ::Geo::VerificationStateDefinition self.primary_key = :cool_widget_id diff --git a/.gitlab/merge_request_templates/Quarantine End to End Test.md b/.gitlab/merge_request_templates/Quarantine End to End Test.md index 5f26f3ac74d..731b51b169b 100644 --- a/.gitlab/merge_request_templates/Quarantine End to End Test.md +++ b/.gitlab/merge_request_templates/Quarantine End to End Test.md @@ -29,7 +29,7 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new - [ ] To ensure a faster turnaround, ask in the `#quality_maintainers` Slack channel for someone to review and merge the merge request, rather than assigning it directly. <!-- Base labels. --> -/label ~"Quality" ~"QA" ~"type::maintenance" +/label ~"Quality" ~"QA" ~"type::maintenance" ~"maintenance::pipelines" <!-- Choose the stage that appears in the test path, e.g. ~"devops::create" for |