Add latest changes from gitlab-org/gitlab@master

5 files changed, 3 insertions, 9 deletions

diff --git a/.rubocop_todo/performance/active_record_subtransaction_methods.yml b/.rubocop_todo/performance/active_record_subtransaction_methods.yml
index 2644f08c4d1..1eeb37ff3fd 100644
--- a/.rubocop_todo/performance/active_record_subtransaction_methods.yml
+++ b/.rubocop_todo/performance/active_record_subtransaction_methods.yml
@@ -43,7 +43,6 @@ Performance/ActiveRecordSubtransactionMethods:
     - 'ee/db/fixtures/production/027_plans.rb'
     - 'ee/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules.rb'
     - 'ee/lib/gitlab/elastic/indexer.rb'
-    - 'lib/gitlab/ci/pipeline/seed/environment.rb'
     - 'lib/gitlab/ci/pipeline/seed/processable/resource_group.rb'
     - 'lib/gitlab/ci/trace/chunked_io.rb'
     - 'lib/gitlab/composer/cache.rb'
diff --git a/.rubocop_todo/performance/bind_call.yml b/.rubocop_todo/performance/bind_call.yml
index 5adb519793d..732aecc3910 100644
--- a/.rubocop_todo/performance/bind_call.yml
+++ b/.rubocop_todo/performance/bind_call.yml
@@ -1,5 +1,5 @@
 ---
-# Cop supports --auto-correct.
+# Cop supports --autocorrect.
 Performance/BindCall:
   Exclude:
     - 'app/services/metrics/dashboard/grafana_metric_embed_service.rb'
diff --git a/.rubocop_todo/performance/method_object_as_block.yml b/.rubocop_todo/performance/method_object_as_block.yml
index b28f56babfd..8524376772e 100644
--- a/.rubocop_todo/performance/method_object_as_block.yml
+++ b/.rubocop_todo/performance/method_object_as_block.yml
@@ -11,7 +11,6 @@ Performance/MethodObjectAsBlock:
     - 'app/models/container_repository.rb'
     - 'app/models/programming_language.rb'
     - 'app/presenters/packages/detail/package_presenter.rb'
-    - 'app/services/bulk_imports/file_download_service.rb'
     - 'app/services/ci/pipeline_processing/atomic_processing_service.rb'
     - 'app/services/ci/prometheus_metrics/observe_histograms_service.rb'
     - 'app/services/concerns/users/participable_service.rb'
@@ -26,7 +25,6 @@ Performance/MethodObjectAsBlock:
     - 'ee/app/finders/security/findings_finder.rb'
     - 'ee/app/graphql/resolvers/vulnerabilities/scanners_resolver.rb'
     - 'ee/app/services/dashboard/projects/create_service.rb'
-    - 'ee/app/services/security/findings/cleanup_service.rb'
     - 'ee/app/services/security/ingestion/ingest_reports_service.rb'
     - 'ee/app/services/security/ingestion/tasks/ingest_vulnerability_statistics.rb'
     - 'ee/app/services/security/store_grouped_scans_service.rb'
@@ -75,7 +73,6 @@ Performance/MethodObjectAsBlock:
     - 'lib/gitlab/uploads/migration_helper.rb'
     - 'lib/gitlab/utils.rb'
     - 'lib/peek/views/detailed_view.rb'
-    - 'lib/tasks/gitlab/assets.rake'
     - 'lib/unnested_in_filters/rewriter.rb'
     - 'qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb'
     - 'rubocop/cop/avoid_return_from_blocks.rb'
@@ -87,7 +84,6 @@ Performance/MethodObjectAsBlock:
     - 'spec/lib/gitlab/search_context/builder_spec.rb'
     - 'spec/models/design_management/version_spec.rb'
     - 'spec/services/notification_service_spec.rb'
-    - 'spec/services/projects/container_repository/cleanup_tags_service_spec.rb'
     - 'spec/support/helpers/migrations_helpers.rb'
     - 'spec/support/shared_examples/models/active_record_enum_shared_examples.rb'
     - 'spec/support_specs/helpers/stub_feature_flags_spec.rb'
diff --git a/.rubocop_todo/performance/redundant_block_call.yml b/.rubocop_todo/performance/redundant_block_call.yml
index 89a67e3fd30..64b185cb6c8 100644
--- a/.rubocop_todo/performance/redundant_block_call.yml
+++ b/.rubocop_todo/performance/redundant_block_call.yml
@@ -1,5 +1,5 @@
 ---
-# Cop supports --auto-correct.
+# Cop supports --autocorrect.
 Performance/RedundantBlockCall:
   Exclude:
     - 'ee/app/models/gitlab_subscription.rb'
diff --git a/.rubocop_todo/performance/string_include.yml b/.rubocop_todo/performance/string_include.yml
index f477593c02a..2a2d0559397 100644
--- a/.rubocop_todo/performance/string_include.yml
+++ b/.rubocop_todo/performance/string_include.yml
@@ -1,5 +1,5 @@
 ---
-# Cop supports --auto-correct.
+# Cop supports --autocorrect.
 Performance/StringInclude:
   Exclude:
     - 'app/models/snippet_repository.rb'
@@ -7,7 +7,6 @@ Performance/StringInclude:
     - 'config/spring.rb'
     - 'ee/app/models/ee/container_registry/event.rb'
     - 'ee/lib/gitlab/auth/smartcard/certificate.rb'
-    - 'lib/gitlab/database/migration_helpers.rb'
     - 'lib/kramdown/parser/atlassian_document_format.rb'
     - 'lib/prometheus/pid_provider.rb'
     - 'spec/features/projects/jobs_spec.rb'