Add latest changes from gitlab-org/gitlab@master

2 files changed, 79 insertions, 30 deletions

diff --git a/.rubocop_todo/database/multiple_databases.yml b/.rubocop_todo/database/multiple_databases.yml
index 27e28128a98..8e372b89bbd 100644
--- a/.rubocop_todo/database/multiple_databases.yml
+++ b/.rubocop_todo/database/multiple_databases.yml
@@ -1,33 +1,38 @@
 ---
 Database/MultipleDatabases:
   Exclude:
-  - ee/spec/services/ee/merge_requests/update_service_spec.rb
-  - lib/backup/database.rb
-  - lib/backup/manager.rb
-  - lib/gitlab/database/load_balancing/load_balancer.rb
-  - lib/gitlab/database/load_balancing.rb
-  - lib/gitlab/database/load_balancing/sticking.rb
-  - lib/gitlab/database/migrations/observers/migration_observer.rb
-  - lib/gitlab/database/migrations/observers/query_log.rb
-  - lib/gitlab/database/partitioning_migration_helpers/backfill_partitioned_table.rb
-  - lib/gitlab/database.rb
-  - lib/gitlab/health_checks/db_check.rb
-  - lib/gitlab/seeder.rb
-  - spec/db/schema_spec.rb
-  - spec/initializers/database_config_spec.rb
-  - spec/lib/backup/manager_spec.rb
-  - spec/lib/gitlab/database_spec.rb
-  - spec/lib/gitlab/metrics/subscribers/active_record_spec.rb
-  - spec/lib/gitlab/profiler_spec.rb
-  - spec/lib/gitlab/usage/metrics/names_suggestions/relation_parsers/constraints_spec.rb
-  - spec/lib/gitlab/usage/metrics/names_suggestions/relation_parsers/joins_spec.rb
-  - spec/support/caching.rb
-  - spec/support/gitlab/usage/metrics_instrumentation_shared_examples.rb
-  - spec/support/helpers/database_connection_helpers.rb
-  - spec/support/helpers/database/database_helpers.rb
-  - spec/support/helpers/database/table_schema_helpers.rb
-  - spec/support/helpers/migrations_helpers.rb
-  - spec/support/helpers/query_recorder.rb
-  - spec/support/helpers/usage_data_helpers.rb
-  - spec/tasks/gitlab/backup_rake_spec.rb
-  - spec/tasks/gitlab/db_rake_spec.rb
+    - 'config/application.rb'
+    - 'config/initializers/active_record_data_types.rb'
+    - 'config/initializers/active_record_force_reconnects.rb'
+    - 'config/initializers/active_record_lifecycle.rb'
+    - 'config/initializers/sidekiq.rb'
+    - 'config/initializers/validate_database_config.rb'
+    - 'db/post_migrate/20210317104032_set_iteration_cadence_automatic_to_false.rb'
+    - 'db/post_migrate/20210811122206_update_external_project_bots.rb'
+    - 'db/post_migrate/20210812013042_remove_duplicate_project_authorizations.rb'
+    - 'ee/lib/tasks/geo.rake'
+    - 'ee/spec/services/ee/merge_requests/update_service_spec.rb'
+    - 'lib/backup/database.rb'
+    - 'lib/backup/manager.rb'
+    - 'lib/gitlab/database.rb'
+    - 'lib/gitlab/database/load_balancing/load_balancer.rb'
+    - 'lib/gitlab/database/migrations/observers/query_log.rb'
+    - 'lib/tasks/dev.rake'
+    - 'lib/tasks/gitlab/db/validate_config.rake'
+    - 'spec/db/schema_spec.rb'
+    - 'spec/initializers/database_config_spec.rb'
+    - 'spec/lib/backup/manager_spec.rb'
+    - 'spec/lib/gitlab/database_spec.rb'
+    - 'spec/lib/gitlab/metrics/subscribers/active_record_spec.rb'
+    - 'spec/lib/gitlab/profiler_spec.rb'
+    - 'spec/lib/gitlab/usage/metrics/names_suggestions/relation_parsers/constraints_spec.rb'
+    - 'spec/lib/gitlab/usage/metrics/names_suggestions/relation_parsers/joins_spec.rb'
+    - 'spec/support/caching.rb'
+    - 'spec/support/gitlab/usage/metrics_instrumentation_shared_examples.rb'
+    - 'spec/support/helpers/database/database_helpers.rb'
+    - 'spec/support/helpers/database/table_schema_helpers.rb'
+    - 'spec/support/helpers/migrations_helpers.rb'
+    - 'spec/support/helpers/query_recorder.rb'
+    - 'spec/support/helpers/usage_data_helpers.rb'
+    - 'spec/tasks/gitlab/backup_rake_spec.rb'
+    - 'spec/tasks/gitlab/db_rake_spec.rb'
diff --git a/.rubocop_todo/performance/block_given_with_explicit_block.yml b/.rubocop_todo/performance/block_given_with_explicit_block.yml
new file mode 100644
index 00000000000..ae61c5a86e6
--- /dev/null
+++ b/.rubocop_todo/performance/block_given_with_explicit_block.yml
@@ -0,0 +1,44 @@
+---
+# Cop supports --auto-correct.
+Performance/BlockGivenWithExplicitBlock:
+  # Offense count: 53
+  # Temporarily disabled due to too many offenses
+  Enabled: false
+  Exclude:
+    - 'app/controllers/concerns/redis_tracking.rb'
+    - 'app/helpers/badges_helper.rb'
+    - 'app/helpers/instance_configuration_helper.rb'
+    - 'app/helpers/labels_helper.rb'
+    - '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'
+    - 'lib/bulk_imports/clients/http.rb'
+    - 'lib/gitlab/batch_pop_queueing.rb'
+    - 'lib/gitlab/cache/request_cache.rb'
+    - 'lib/gitlab/ci/trace/chunked_io.rb'
+    - 'lib/gitlab/database/bulk_update.rb'
+    - 'lib/gitlab/database/with_lock_retries.rb'
+    - 'lib/gitlab/github_import/client.rb'
+    - 'lib/gitlab/legacy_github_import/client.rb'
+    - 'lib/gitlab/metrics/methods/metric_options.rb'
+    - 'lib/gitlab/null_request_store.rb'
+    - 'lib/gitlab/quick_actions/dsl.rb'
+    - 'lib/gitlab/safe_request_loader.rb'
+    - 'lib/gitlab/search/query.rb'
+    - 'lib/gitlab/string_placeholder_replacer.rb'
+    - 'lib/gitlab/terraform/state_migration_helper.rb'
+    - 'lib/gitlab/usage/metrics/instrumentations/database_metric.rb'
+    - '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'
+    - 'spec/support/helpers/query_recorder.rb'
+    - 'tooling/lib/tooling/helm3_client.rb'
+    - 'tooling/lib/tooling/test_map_packer.rb'