Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

3 files changed, 0 insertions, 14 deletions

diff --git a/.rubocop_todo/migration/background_migration_base_class.yml b/.rubocop_todo/migration/background_migration_base_class.yml
index 56b6a4294d4..9f5fb15289b 100644
--- a/.rubocop_todo/migration/background_migration_base_class.yml
+++ b/.rubocop_todo/migration/background_migration_base_class.yml
@@ -1,7 +1,6 @@
 ---
 Migration/BackgroundMigrationBaseClass:
   Exclude:
-    - 'lib/gitlab/background_migration/add_primary_email_to_emails_if_user_confirmed.rb'
     - 'lib/gitlab/background_migration/backfill_ci_queuing_tables.rb'
     - 'lib/gitlab/background_migration/backfill_draft_status_on_merge_requests.rb'
     - 'lib/gitlab/background_migration/backfill_integrations_enable_ssl_verification.rb'
diff --git a/.rubocop_todo/migration/background_migration_record.yml b/.rubocop_todo/migration/background_migration_record.yml
index 567926e33a2..ec2b9fb6d6a 100644
--- a/.rubocop_todo/migration/background_migration_record.yml
+++ b/.rubocop_todo/migration/background_migration_record.yml
@@ -12,7 +12,6 @@ Migration/BackgroundMigrationRecord:
     - 'ee/lib/ee/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
     - 'ee/lib/ee/gitlab/background_migration/populate_uuids_for_security_findings.rb'
     - 'ee/lib/ee/gitlab/background_migration/update_vulnerability_occurrences_location.rb'
-    - 'lib/gitlab/background_migration/add_primary_email_to_emails_if_user_confirmed.rb'
     - 'lib/gitlab/background_migration/backfill_ci_queuing_tables.rb'
     - 'lib/gitlab/background_migration/backfill_draft_status_on_merge_requests.rb'
     - 'lib/gitlab/background_migration/backfill_namespace_traversal_ids_children.rb'
diff --git a/.rubocop_todo/migration/background_migrations.yml b/.rubocop_todo/migration/background_migrations.yml
index 2219f37901d..fbafbb66289 100644
--- a/.rubocop_todo/migration/background_migrations.yml
+++ b/.rubocop_todo/migration/background_migrations.yml
@@ -1,17 +1,6 @@
 ---
 Migration/BackgroundMigrations:
   Exclude:
-    - 'db/migrate/20210519154058_schedule_update_users_where_two_factor_auth_required_from_group.rb'
-    - 'db/post_migrate/20210302074524_backfill_namespace_statistics_with_wiki_size.rb'
-    - 'db/post_migrate/20210304133508_schedule_remove_duplicate_vulnerabilities_findings2.rb'
-    - 'db/post_migrate/20210415155043_move_container_registry_enabled_to_project_features3.rb'
-    - 'db/post_migrate/20210423160427_schedule_drop_invalid_vulnerabilities.rb'
-    - 'db/post_migrate/20210427212034_schedule_update_timelogs_project_id.rb'
-    - 'db/post_migrate/20210506065000_schedule_backfill_traversal_ids.rb'
-    - 'db/post_migrate/20210511095658_schedule_migrate_project_taggings_context_from_tags_to_topics.rb'
-    - 'db/post_migrate/20210511142748_schedule_drop_invalid_vulnerabilities2.rb'
-    - 'db/post_migrate/20210514063252_schedule_cleanup_orphaned_lfs_objects_projects.rb'
-    - 'db/post_migrate/20210518074332_schedule_disable_expiration_policies_linked_to_no_container_images.rb'
     - 'db/post_migrate/20210604070207_retry_backfill_traversal_ids.rb'
     - 'db/post_migrate/20210611080951_fix_missing_traversal_ids.rb'
     - 'db/post_migrate/20210701111909_backfill_issues_upvotes_count.rb'
@@ -26,7 +15,6 @@ Migration/BackgroundMigrations:
     - 'db/post_migrate/20210901153324_slice_merge_request_diff_commit_migrations.rb'
     - 'db/post_migrate/20210909104800_reschedule_extract_project_topics_into_separate_table_2.rb'
     - 'db/post_migrate/20211004110927_schedule_fix_first_mentioned_in_commit_at_job.rb'
-    - 'db/post_migrate/20211004120135_schedule_add_primary_email_to_emails_if_user_confirmed.rb'
     - 'db/post_migrate/20211005010101_rereschedule_delete_orphaned_deployments.rb'
     - 'db/post_migrate/20211005194425_schedule_requirements_migration.rb'
     - 'db/post_migrate/20211006060436_schedule_populate_topics_total_projects_count_cache.rb'