Add latest changes from gitlab-org/gitlab@master

5 files changed, 49 insertions, 65 deletions

diff --git a/.rubocop_todo/performance/active_record_subtransaction_methods.yml b/.rubocop_todo/performance/active_record_subtransaction_methods.yml
index ada27f99eb9..2644f08c4d1 100644
--- a/.rubocop_todo/performance/active_record_subtransaction_methods.yml
+++ b/.rubocop_todo/performance/active_record_subtransaction_methods.yml
@@ -1,62 +1,50 @@
 ---
 Performance/ActiveRecordSubtransactionMethods:
   Exclude:
-  - app/controllers/clusters/clusters_controller.rb
-  - app/controllers/repositories/lfs_storage_controller.rb
-  - app/controllers/search_controller.rb
-  - app/models/application_record.rb
-  - app/models/ci/ref.rb
-  - app/models/container_repository.rb
-  - app/models/design_management/design_collection.rb
-  - app/models/error_tracking/error.rb
-  - app/models/external_pull_request.rb
-  - app/models/merge_request.rb
-  - app/models/plan.rb
-  - app/models/project.rb
-  - app/models/shard.rb
-  - app/models/x509_certificate.rb
-  - app/models/x509_commit_signature.rb
-  - app/models/x509_issuer.rb
-  - app/models/concerns/commit_signature.rb
-  - app/services/bulk_imports/relation_export_service.rb
-  - app/services/ci/update_build_state_service.rb
-  - app/services/event_create_service.rb
-  - app/services/groups/import_export/import_service.rb
-  - app/services/lfs/file_transformer.rb
-  - app/services/merge_requests/approval_service.rb
-  - app/services/namespaces/statistics_refresher_service.rb
-  - app/services/packages/rubygems/create_dependencies_service.rb
-  - app/services/packages/rubygems/metadata_extraction_service.rb
-  - app/services/projects/create_service.rb
-  - app/services/projects/lfs_pointers/lfs_download_service.rb
-  - app/services/service_desk_settings/update_service.rb
-  - app/services/service_ping/submit_service.rb
-  - app/services/terraform/remote_state_handler.rb
-  - app/workers/namespaces/schedule_aggregation_worker.rb
-  - app/workers/project_export_worker.rb
-  - db/migrate/20200212014653_rename_security_dashboard_feature_flag_to_instance_security_dashboard.rb
-  - db/post_migrate/20200214034836_remove_security_dashboard_feature_flag.rb
-  - db/post_migrate/20210824174615_prepare_ci_builds_metadata_and_ci_build_async_indexes.rb
-  - ee/app/models/ci/minutes/namespace_monthly_usage.rb
-  - ee/app/models/ci/minutes/project_monthly_usage.rb
-  - ee/app/models/concerns/deprecated_approvals_before_merge.rb
-  - ee/app/models/ee/iteration.rb
-  - ee/app/models/ee/plan.rb
-  - ee/app/models/elastic/index_setting.rb
-  - ee/app/models/gitlab_subscription.rb
-  - ee/app/models/software_license.rb
-  - ee/app/services/boards/user_preferences/update_service.rb
-  - ee/app/services/ci/minutes/update_project_and_namespace_usage_service.rb
-  - ee/app/services/ee/analytics/cycle_analytics/stages/base_service.rb
-  - ee/app/services/security/store_report_service.rb
-  - ee/app/services/security/store_scan_service.rb
-  - ee/app/workers/import_software_licenses_worker.rb
-  - 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
-  - lib/gitlab/database/async_indexes/migration_helpers.rb
-  - lib/gitlab/issuables_count_for_state.rb
+    - 'app/controllers/repositories/lfs_storage_controller.rb'
+    - 'app/controllers/search_controller.rb'
+    - 'app/models/application_record.rb'
+    - 'app/models/ci/ref.rb'
+    - 'app/models/concerns/commit_signature.rb'
+    - 'app/models/container_repository.rb'
+    - 'app/models/design_management/design_collection.rb'
+    - 'app/models/error_tracking/error.rb'
+    - 'app/models/external_pull_request.rb'
+    - 'app/models/plan.rb'
+    - 'app/models/project.rb'
+    - 'app/models/shard.rb'
+    - 'app/models/x509_certificate.rb'
+    - 'app/models/x509_issuer.rb'
+    - 'app/services/bulk_imports/relation_export_service.rb'
+    - 'app/services/ci/update_build_state_service.rb'
+    - 'app/services/event_create_service.rb'
+    - 'app/services/groups/import_export/import_service.rb'
+    - 'app/services/lfs/file_transformer.rb'
+    - 'app/services/merge_requests/approval_service.rb'
+    - 'app/services/namespaces/statistics_refresher_service.rb'
+    - 'app/services/packages/rubygems/create_dependencies_service.rb'
+    - 'app/services/projects/create_service.rb'
+    - 'app/services/projects/lfs_pointers/lfs_download_service.rb'
+    - 'app/services/service_desk_settings/update_service.rb'
+    - 'app/services/terraform/remote_state_handler.rb'
+    - 'app/workers/namespaces/schedule_aggregation_worker.rb'
+    - 'app/workers/project_export_worker.rb'
+    - 'ee/app/models/ci/minutes/project_monthly_usage.rb'
+    - 'ee/app/models/concerns/deprecated_approvals_before_merge.rb'
+    - 'ee/app/models/ee/plan.rb'
+    - 'ee/app/models/elastic/index_setting.rb'
+    - 'ee/app/models/gitlab_subscription.rb'
+    - 'ee/app/models/software_license.rb'
+    - 'ee/app/services/boards/user_preferences/update_service.rb'
+    - 'ee/app/services/ci/minutes/update_project_and_namespace_usage_service.rb'
+    - 'ee/app/services/ee/analytics/cycle_analytics/stages/base_service.rb'
+    - 'ee/app/services/security/store_scan_service.rb'
+    - 'ee/app/workers/import_software_licenses_worker.rb'
+    - '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'
+    - 'lib/gitlab/issuables_count_for_state.rb'
diff --git a/.rubocop_todo/performance/block_given_with_explicit_block.yml b/.rubocop_todo/performance/block_given_with_explicit_block.yml
index ae61c5a86e6..ff1f5e568ea 100644
--- a/.rubocop_todo/performance/block_given_with_explicit_block.yml
+++ b/.rubocop_todo/performance/block_given_with_explicit_block.yml
@@ -12,7 +12,6 @@ Performance/BlockGivenWithExplicitBlock:
     - 'app/helpers/tab_helper.rb'
     - 'app/services/base_count_service.rb'
     - 'app/services/error_tracking/base_service.rb'
-    - 'app/services/projects/open_issues_count_service.rb'
     - 'app/services/users/update_service.rb'
     - 'ee/lib/elastic/latest/query_context.rb'
     - 'ee/lib/gitlab/geo.rb'
@@ -35,7 +34,6 @@ Performance/BlockGivenWithExplicitBlock:
     - 'lib/gitlab/usage_data_queries.rb'
     - 'lib/gitlab/utils/usage_data.rb'
     - 'qa/qa/page/view.rb'
-    - 'qa/qa/runtime/browser.rb'
     - 'spec/lib/api/helpers/authentication_spec.rb'
     - 'spec/lib/gitlab/slash_commands/deploy_spec.rb'
     - 'spec/support/helpers/graphql_helpers.rb'
diff --git a/.rubocop_todo/performance/constant_regexp.yml b/.rubocop_todo/performance/constant_regexp.yml
index fb2b7d6ef49..4ed40db498f 100644
--- a/.rubocop_todo/performance/constant_regexp.yml
+++ b/.rubocop_todo/performance/constant_regexp.yml
@@ -28,5 +28,4 @@ Performance/ConstantRegexp:
     - 'scripts/perf/query_limiting_report.rb'
     - 'scripts/validate_migration_schema'
     - 'spec/models/concerns/token_authenticatable_spec.rb'
-    - 'spec/scripts/lib/glfm/update_specification_spec.rb'
     - 'spec/services/notes/copy_service_spec.rb'
diff --git a/.rubocop_todo/performance/rubyzip.yml b/.rubocop_todo/performance/rubyzip.yml
index a0752fa51cd..c49fae8bbab 100644
--- a/.rubocop_todo/performance/rubyzip.yml
+++ b/.rubocop_todo/performance/rubyzip.yml
@@ -1,5 +1,5 @@
 ---
 Performance/Rubyzip:
   Exclude:
-  - app/services/packages/nuget/metadata_extraction_service.rb
-  - lib/gitlab/ci/artifact_file_reader.rb
+    - 'app/services/packages/nuget/metadata_extraction_service.rb'
+    - 'lib/gitlab/ci/artifact_file_reader.rb'
diff --git a/.rubocop_todo/performance/string_include.yml b/.rubocop_todo/performance/string_include.yml
index cb6e566094e..f477593c02a 100644
--- a/.rubocop_todo/performance/string_include.yml
+++ b/.rubocop_todo/performance/string_include.yml
@@ -10,6 +10,5 @@ Performance/StringInclude:
     - 'lib/gitlab/database/migration_helpers.rb'
     - 'lib/kramdown/parser/atlassian_document_format.rb'
     - 'lib/prometheus/pid_provider.rb'
-    - 'qa/qa/specs/runner.rb'
     - 'spec/features/projects/jobs_spec.rb'
     - 'spec/spec_helper.rb'