Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 25 insertions, 30 deletions

diff --git a/.rubocop_todo/database/multiple_databases.yml b/.rubocop_todo/database/multiple_databases.yml
index 27e28128a98..1d0085e1ba6 100644
--- a/.rubocop_todo/database/multiple_databases.yml
+++ b/.rubocop_todo/database/multiple_databases.yml
@@ -1,33 +1,28 @@
 ---
 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/initializers/active_record_data_types.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/spec/services/ee/merge_requests/update_service_spec.rb'
+    - 'lib/backup/manager.rb'
+    - 'lib/gitlab/background_migration/backfill_projects_with_coverage.rb'
+    - 'lib/gitlab/background_migration/copy_ci_builds_columns_to_security_scans.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/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'