Add latest changes from gitlab-org/gitlab@master

5 files changed, 105 insertions, 0 deletions

diff --git a/db/post_migrate/20231207220954_finalize_backfill_project_statistics_storage_size_without_pipeline_artifacts_si.rb b/db/post_migrate/20231207220954_finalize_backfill_project_statistics_storage_size_without_pipeline_artifacts_si.rb
new file mode 100644
index 00000000000..e14f1277eb9
--- /dev/null
+++ b/db/post_migrate/20231207220954_finalize_backfill_project_statistics_storage_size_without_pipeline_artifacts_si.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeBackfillProjectStatisticsStorageSizeWithoutPipelineArtifactsSi < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillProjectStatisticsStorageSizeWithoutPipelineArtifactsSizeJob',
+      table_name: :project_statistics,
+      column_name: :project_id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/post_migrate/20231207221119_finalize_cleanup_personal_access_tokens_with_nil_expires_at.rb b/db/post_migrate/20231207221119_finalize_cleanup_personal_access_tokens_with_nil_expires_at.rb
new file mode 100644
index 00000000000..75d9b6ed80e
--- /dev/null
+++ b/db/post_migrate/20231207221119_finalize_cleanup_personal_access_tokens_with_nil_expires_at.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeCleanupPersonalAccessTokensWithNilExpiresAt < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'CleanupPersonalAccessTokensWithNilExpiresAt',
+      table_name: :personal_access_tokens,
+      column_name: :id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/post_migrate/20231207221140_finalize_delete_orphaned_transferred_project_approval_rules.rb b/db/post_migrate/20231207221140_finalize_delete_orphaned_transferred_project_approval_rules.rb
new file mode 100644
index 00000000000..d7ab6ab85be
--- /dev/null
+++ b/db/post_migrate/20231207221140_finalize_delete_orphaned_transferred_project_approval_rules.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeDeleteOrphanedTransferredProjectApprovalRules < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'DeleteOrphanedTransferredProjectApprovalRules',
+      table_name: :approval_project_rules,
+      column_name: :id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/post_migrate/20231207221241_finalize_populate_vulnerability_dismissal_fields.rb b/db/post_migrate/20231207221241_finalize_populate_vulnerability_dismissal_fields.rb
new file mode 100644
index 00000000000..51c3dd5966f
--- /dev/null
+++ b/db/post_migrate/20231207221241_finalize_populate_vulnerability_dismissal_fields.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizePopulateVulnerabilityDismissalFields < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'PopulateVulnerabilityDismissalFields',
+      table_name: :vulnerabilities,
+      column_name: :id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/post_migrate/20231207221300_finalize_remove_invalid_deploy_access_level_groups.rb b/db/post_migrate/20231207221300_finalize_remove_invalid_deploy_access_level_groups.rb
new file mode 100644
index 00000000000..c20ff6673fe
--- /dev/null
+++ b/db/post_migrate/20231207221300_finalize_remove_invalid_deploy_access_level_groups.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeRemoveInvalidDeployAccessLevelGroups < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'RemoveInvalidDeployAccessLevelGroups',
+      table_name: :protected_environment_deploy_access_levels,
+      column_name: :id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down; end
+end