Add latest changes from gitlab-org/gitlab@master

6 files changed, 0 insertions, 7 deletions

diff --git a/.rubocop_todo/layout/first_hash_element_indentation.yml b/.rubocop_todo/layout/first_hash_element_indentation.yml
index 007616b40b1..5f586cc6206 100644
--- a/.rubocop_todo/layout/first_hash_element_indentation.yml
+++ b/.rubocop_todo/layout/first_hash_element_indentation.yml
@@ -9,7 +9,6 @@ Layout/FirstHashElementIndentation:
     - 'app/controllers/projects/badges_controller.rb'
     - 'app/controllers/projects/merge_requests_controller.rb'
     - 'app/controllers/repositories/lfs_locks_api_controller.rb'
-    - 'app/experiments/concerns/project_commit_count.rb'
     - 'app/graphql/mutations/notes/create/diff_note.rb'
     - 'app/graphql/mutations/notes/create/image_diff_note.rb'
     - 'app/graphql/mutations/notes/create/note.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 99d866627d0..ed2245f39e0 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -3210,7 +3210,6 @@ Layout/LineLength:
     - 'spec/controllers/uploads_controller_spec.rb'
     - 'spec/db/schema_spec.rb'
     - 'spec/deprecation_toolkit_env.rb'
-    - 'spec/experiments/concerns/project_commit_count_spec.rb'
     - 'spec/factories/ci/job_artifacts.rb'
     - 'spec/factories/ci/pipelines.rb'
     - 'spec/factories/ci/reports/codequality_degradations.rb'
diff --git a/.rubocop_todo/lint/empty_block.yml b/.rubocop_todo/lint/empty_block.yml
index 5751ca7641f..dbcef42eab4 100644
--- a/.rubocop_todo/lint/empty_block.yml
+++ b/.rubocop_todo/lint/empty_block.yml
@@ -4,7 +4,6 @@ Lint/EmptyBlock:
     - 'app/controllers/groups/boards_controller.rb'
     - 'app/controllers/projects/boards_controller.rb'
     - 'app/controllers/projects/pipelines_controller.rb'
-    - 'app/experiments/logged_out_marketing_header_experiment.rb'
     - 'config/application.rb'
     - 'ee/app/controllers/projects/learn_gitlab_controller.rb'
     - 'ee/spec/factories/incident_management/escalation_rules.rb'
diff --git a/.rubocop_todo/rspec/described_class.yml b/.rubocop_todo/rspec/described_class.yml
index 94ef19d7cfe..7f0db541ab0 100644
--- a/.rubocop_todo/rspec/described_class.yml
+++ b/.rubocop_todo/rspec/described_class.yml
@@ -46,7 +46,6 @@ RSpec/DescribedClass:
     - 'spec/config/settings_spec.rb'
     - 'spec/controllers/repositories/git_http_controller_spec.rb'
     - 'spec/experiments/application_experiment_spec.rb'
-    - 'spec/experiments/concerns/project_commit_count_spec.rb'
     - 'spec/frontend/fixtures/timezones.rb'
     - 'spec/graphql/gitlab_schema_spec.rb'
     - 'spec/graphql/graphql_triggers_spec.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index b03146e74ae..5dab0b6c5e1 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -1801,8 +1801,6 @@ RSpec/MissingFeatureCategory:
     - 'spec/dependencies/omniauth_saml_spec.rb'
     - 'spec/docs_screenshots/container_registry_docs.rb'
     - 'spec/docs_screenshots/wiki_docs.rb'
-    - 'spec/experiments/concerns/project_commit_count_spec.rb'
-    - 'spec/experiments/force_company_trial_experiment_spec.rb'
     - 'spec/experiments/in_product_guidance_environments_webide_experiment_spec.rb'
     - 'spec/experiments/ios_specific_templates_experiment_spec.rb'
     - 'spec/features/admin/dashboard_spec.rb'
diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml
index d5430dabbf0..3b4d4bc9e94 100644
--- a/.rubocop_todo/rspec/verified_doubles.yml
+++ b/.rubocop_todo/rspec/verified_doubles.yml
@@ -260,7 +260,6 @@ RSpec/VerifiedDoubles:
     - 'spec/controllers/projects/snippets_controller_spec.rb'
     - 'spec/controllers/sessions_controller_spec.rb'
     - 'spec/dependencies/omniauth_saml_spec.rb'
-    - 'spec/experiments/concerns/project_commit_count_spec.rb'
     - 'spec/factories/ci/job_artifacts.rb'
     - 'spec/features/admin/admin_system_info_spec.rb'
     - 'spec/features/clusters/create_agent_spec.rb'