Add latest changes from gitlab-org/gitlab@master

12 files changed, 0 insertions, 27 deletions

diff --git a/.rubocop_todo/fips/md5.yml b/.rubocop_todo/fips/md5.yml
index d50aaf79502..4a1994635b7 100644
--- a/.rubocop_todo/fips/md5.yml
+++ b/.rubocop_todo/fips/md5.yml
@@ -17,5 +17,3 @@ Fips/MD5:
     - 'spec/lib/gitlab/ci/trace/remote_checksum_spec.rb'
     - 'spec/models/concerns/checksummable_spec.rb'
     - 'spec/services/gravatar_service_spec.rb'
-    - 'spec/tooling/rspec_flaky/example_spec.rb'
-    - 'tooling/rspec_flaky/example.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index dc6cccb6762..681cc7ee4c1 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -3099,7 +3099,6 @@ Layout/LineLength:
     - 'scripts/api/cancel_pipeline.rb'
     - 'scripts/api/get_job_id.rb'
     - 'scripts/changed-feature-flags'
-    - 'scripts/flaky_examples/prune-old-flaky-examples'
     - 'scripts/lint_templates_bash.rb'
     - 'scripts/no-dir-check'
     - 'scripts/perf/query_limiting_report.rb'
@@ -5062,9 +5061,6 @@ Layout/LineLength:
     - 'spec/tooling/lib/tooling/kubernetes_client_spec.rb'
     - 'spec/tooling/lib/tooling/test_map_generator_spec.rb'
     - 'spec/tooling/quality/test_level_spec.rb'
-    - 'spec/tooling/rspec_flaky/config_spec.rb'
-    - 'spec/tooling/rspec_flaky/flaky_examples_collection_spec.rb'
-    - 'spec/tooling/rspec_flaky/report_spec.rb'
     - 'spec/uploaders/ci/pipeline_artifact_uploader_spec.rb'
     - 'spec/uploaders/file_mover_spec.rb'
     - 'spec/uploaders/file_uploader_spec.rb'
@@ -5175,5 +5171,3 @@ Layout/LineLength:
     - 'tooling/lib/tooling/kubernetes_client.rb'
     - 'tooling/merge_request_rspec_failure_rake_task.rb'
     - 'tooling/quality/test_level.rb'
-    - 'tooling/rspec_flaky/listener.rb'
-    - 'tooling/rspec_flaky/report.rb'
diff --git a/.rubocop_todo/lint/non_atomic_file_operation.yml b/.rubocop_todo/lint/non_atomic_file_operation.yml
index cd700870448..d9d415de923 100644
--- a/.rubocop_todo/lint/non_atomic_file_operation.yml
+++ b/.rubocop_todo/lint/non_atomic_file_operation.yml
@@ -41,5 +41,3 @@ Lint/NonAtomicFileOperation:
     - 'spec/services/bulk_imports/repository_bundle_export_service_spec.rb'
     - 'spec/services/bulk_imports/uploads_export_service_spec.rb'
     - 'spec/support/database/query_recorder.rb'
-    - 'spec/tooling/rspec_flaky/report_spec.rb'
-    - 'tooling/rspec_flaky/report.rb'
diff --git a/.rubocop_todo/lint/redundant_cop_disable_directive.yml b/.rubocop_todo/lint/redundant_cop_disable_directive.yml
index b35f876ed50..7a07242ab29 100644
--- a/.rubocop_todo/lint/redundant_cop_disable_directive.yml
+++ b/.rubocop_todo/lint/redundant_cop_disable_directive.yml
@@ -316,4 +316,3 @@ Lint/RedundantCopDisableDirective:
     - 'tooling/lib/tooling/helm3_client.rb'
     - 'tooling/lib/tooling/kubernetes_client.rb'
     - 'tooling/quality/test_level.rb'
-    - 'tooling/rspec_flaky/listener.rb'
diff --git a/.rubocop_todo/lint/unused_block_argument.yml b/.rubocop_todo/lint/unused_block_argument.yml
index 01510a8443d..05e30a7f9ad 100644
--- a/.rubocop_todo/lint/unused_block_argument.yml
+++ b/.rubocop_todo/lint/unused_block_argument.yml
@@ -426,6 +426,5 @@ Lint/UnusedBlockArgument:
     - 'spec/support/shared_examples/uploaders/object_storage_shared_examples.rb'
     - 'spec/support/shared_examples/workers/concerns/reenqueuer_shared_examples.rb'
     - 'spec/tooling/lib/tooling/find_codeowners_spec.rb'
-    - 'spec/tooling/rspec_flaky/config_spec.rb'
     - 'spec/workers/projects/git_garbage_collect_worker_spec.rb'
     - 'tooling/lib/tooling/find_codeowners.rb'
diff --git a/.rubocop_todo/rspec/expect_in_hook.yml b/.rubocop_todo/rspec/expect_in_hook.yml
index 3ae4d9ee7f4..b0369d5180d 100644
--- a/.rubocop_todo/rspec/expect_in_hook.yml
+++ b/.rubocop_todo/rspec/expect_in_hook.yml
@@ -466,7 +466,6 @@ RSpec/ExpectInHook:
     - 'spec/tasks/gitlab/praefect_rake_spec.rb'
     - 'spec/lib/gitlab/task_helpers_spec.rb'
     - 'spec/tooling/danger/feature_flag_spec.rb'
-    - 'spec/tooling/rspec_flaky/listener_spec.rb'
     - 'spec/uploaders/file_mover_spec.rb'
     - 'spec/uploaders/gitlab_uploader_spec.rb'
     - 'spec/uploaders/object_storage_spec.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index a7945a5356c..4b11d048bb9 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -5617,12 +5617,6 @@ RSpec/MissingFeatureCategory:
     - 'spec/tooling/lib/tooling/test_map_generator_spec.rb'
     - 'spec/tooling/lib/tooling/test_map_packer_spec.rb'
     - 'spec/tooling/merge_request_spec.rb'
-    - 'spec/tooling/rspec_flaky/config_spec.rb'
-    - 'spec/tooling/rspec_flaky/example_spec.rb'
-    - 'spec/tooling/rspec_flaky/flaky_example_spec.rb'
-    - 'spec/tooling/rspec_flaky/flaky_examples_collection_spec.rb'
-    - 'spec/tooling/rspec_flaky/listener_spec.rb'
-    - 'spec/tooling/rspec_flaky/report_spec.rb'
     - 'spec/uploaders/attachment_uploader_spec.rb'
     - 'spec/uploaders/avatar_uploader_spec.rb'
     - 'spec/uploaders/ci/pipeline_artifact_uploader_spec.rb'
diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml
index 285dd769e25..0d66bf5604b 100644
--- a/.rubocop_todo/rspec/verified_doubles.yml
+++ b/.rubocop_todo/rspec/verified_doubles.yml
@@ -983,8 +983,6 @@ RSpec/VerifiedDoubles:
     - 'spec/tooling/danger/project_helper_spec.rb'
     - 'spec/tooling/lib/tooling/helm3_client_spec.rb'
     - 'spec/tooling/lib/tooling/kubernetes_client_spec.rb'
-    - 'spec/tooling/rspec_flaky/example_spec.rb'
-    - 'spec/tooling/rspec_flaky/listener_spec.rb'
     - 'spec/uploaders/file_uploader_spec.rb'
     - 'spec/uploaders/object_storage_spec.rb'
     - 'spec/uploaders/personal_file_uploader_spec.rb'
diff --git a/.rubocop_todo/style/guard_clause.yml b/.rubocop_todo/style/guard_clause.yml
index 302c477af53..64568649287 100644
--- a/.rubocop_todo/style/guard_clause.yml
+++ b/.rubocop_todo/style/guard_clause.yml
@@ -639,5 +639,3 @@ Style/GuardClause:
     - 'tooling/lib/tooling/helm3_client.rb'
     - 'tooling/lib/tooling/image.rb'
     - 'tooling/lib/tooling/kubernetes_client.rb'
-    - 'tooling/rspec_flaky/flaky_example.rb'
-    - 'tooling/rspec_flaky/listener.rb'
diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml
index 09707e68648..a1f516a8abe 100644
--- a/.rubocop_todo/style/if_unless_modifier.yml
+++ b/.rubocop_todo/style/if_unless_modifier.yml
@@ -1074,5 +1074,3 @@ Style/IfUnlessModifier:
     - 'tooling/lib/tooling/find_codeowners.rb'
     - 'tooling/lib/tooling/image.rb'
     - 'tooling/lib/tooling/test_map_packer.rb'
-    - 'tooling/rspec_flaky/flaky_example.rb'
-    - 'tooling/rspec_flaky/flaky_examples_collection.rb'
diff --git a/.rubocop_todo/style/redundant_interpolation.yml b/.rubocop_todo/style/redundant_interpolation.yml
index a618632f552..27cd954f506 100644
--- a/.rubocop_todo/style/redundant_interpolation.yml
+++ b/.rubocop_todo/style/redundant_interpolation.yml
@@ -35,4 +35,3 @@ Style/RedundantInterpolation:
     - 'qa/qa/tools/generate_perf_testdata.rb'
     - 'scripts/perf/gc/print_gc_stats.rb'
     - 'scripts/qa/testcases-check'
-    - 'tooling/rspec_flaky/flaky_example.rb'
diff --git a/.rubocop_todo/style/symbol_proc.yml b/.rubocop_todo/style/symbol_proc.yml
index 0e4602f9f31..67229a8b704 100644
--- a/.rubocop_todo/style/symbol_proc.yml
+++ b/.rubocop_todo/style/symbol_proc.yml
@@ -241,4 +241,3 @@ Style/SymbolProc:
     - 'spec/views/layouts/_published_experiments.html.haml_spec.rb'
     - 'spec/workers/snippets/schedule_bulk_repository_shard_moves_worker_spec.rb'
     - 'tooling/lib/tooling/test_map_generator.rb'
-    - 'tooling/rspec_flaky/flaky_examples_collection.rb'