Add latest changes from gitlab-org/gitlab@master

15 files changed, 123 insertions, 5 deletions

diff --git a/db/docs/batched_background_migrations/backfill_project_statistics_storage_size_without_pipeline_artifacts_size_job.yml b/db/docs/batched_background_migrations/backfill_project_statistics_storage_size_without_pipeline_artifacts_size_job.yml
index b0d27b9f1b9..c8d61991345 100644
--- a/db/docs/batched_background_migrations/backfill_project_statistics_storage_size_without_pipeline_artifacts_size_job.yml
+++ b/db/docs/batched_background_migrations/backfill_project_statistics_storage_size_without_pipeline_artifacts_size_job.yml
@@ -1,6 +1,8 @@
 ---
 migration_job_name: BackfillProjectStatisticsStorageSizeWithoutPipelineArtifactsSizeJob
-description: Refreshes ProjectStatistics to remove pipeline_artifacts_size from the total storage_size
+description: Refreshes ProjectStatistics to remove pipeline_artifacts_size from the
+  total storage_size
 feature_category: consumables_cost_management
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126053
 milestone: '16.3'
+finalized_by: '20231207220954'
diff --git a/db/docs/batched_background_migrations/cleanup_personal_access_tokens_with_nil_expires_at.yml b/db/docs/batched_background_migrations/cleanup_personal_access_tokens_with_nil_expires_at.yml
index e73cd747539..b549c1553d8 100644
--- a/db/docs/batched_background_migrations/cleanup_personal_access_tokens_with_nil_expires_at.yml
+++ b/db/docs/batched_background_migrations/cleanup_personal_access_tokens_with_nil_expires_at.yml
@@ -1,8 +1,10 @@
 ---
 migration_job_name: CleanupPersonalAccessTokensWithNilExpiresAt
-description: Updates value of expires_at column to 365 days from now when it's nil for PersonalAccessTokens
-  Originally introduced via https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120239
-  Re-ran because there was a bypass that enabled some new PATs to be created with nil expires_at. That bypass was patched via https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121370.
+description: Updates value of expires_at column to 365 days from now when it's nil
+  for PersonalAccessTokens Originally introduced via https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120239
+  Re-ran because there was a bypass that enabled some new PATs to be created with
+  nil expires_at. That bypass was patched via https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121370.
 feature_category: system_access
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123002
 milestone: '16.1'
+finalized_by: '20231207221119'
diff --git a/db/docs/batched_background_migrations/delete_orphaned_transferred_project_approval_rules.yml b/db/docs/batched_background_migrations/delete_orphaned_transferred_project_approval_rules.yml
index eaa1a61577d..0dc99914451 100644
--- a/db/docs/batched_background_migrations/delete_orphaned_transferred_project_approval_rules.yml
+++ b/db/docs/batched_background_migrations/delete_orphaned_transferred_project_approval_rules.yml
@@ -6,3 +6,4 @@ description: |
 feature_category: security_policy_management
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127767
 milestone: '16.3'
+finalized_by: '20231207221140'
diff --git a/db/docs/batched_background_migrations/populate_vulnerability_dismissal_fields.yml b/db/docs/batched_background_migrations/populate_vulnerability_dismissal_fields.yml
index 5705ebdc882..a59ecee3be7 100644
--- a/db/docs/batched_background_migrations/populate_vulnerability_dismissal_fields.yml
+++ b/db/docs/batched_background_migrations/populate_vulnerability_dismissal_fields.yml
@@ -5,3 +5,4 @@ feature_category: vulnerability_management
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117478
 queued_migration_version: 20230412185837
 milestone: '15.11'
+finalized_by: '20231207221241'
diff --git a/db/docs/batched_background_migrations/remove_invalid_deploy_access_level_groups.yml b/db/docs/batched_background_migrations/remove_invalid_deploy_access_level_groups.yml
index ddb544aa22a..0556c8c2a32 100644
--- a/db/docs/batched_background_migrations/remove_invalid_deploy_access_level_groups.yml
+++ b/db/docs/batched_background_migrations/remove_invalid_deploy_access_level_groups.yml
@@ -1,6 +1,8 @@
 ---
 migration_job_name: RemoveInvalidDeployAccessLevelGroups
-description: This deletes protected_environment_deploy_access_levels rows that have invalid group_id.
+description: This deletes protected_environment_deploy_access_levels rows that have
+  invalid group_id.
 feature_category: continuous_delivery
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121222
 milestone: '16.1'
+finalized_by: '20231207221300'
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
diff --git a/db/schema_migrations/20231207220954 b/db/schema_migrations/20231207220954
new file mode 100644
index 00000000000..fd7052dfc57
--- /dev/null
+++ b/db/schema_migrations/20231207220954
@@ -0,0 +1 @@
+874f2ca39becd976d06259918ad4898a9db95645615e348c315643e35aee2f72
\ No newline at end of file
diff --git a/db/schema_migrations/20231207221119 b/db/schema_migrations/20231207221119
new file mode 100644
index 00000000000..63427e916fe
--- /dev/null
+++ b/db/schema_migrations/20231207221119
@@ -0,0 +1 @@
+0200a967508b4e8c6056f969e24e26bc85f6762b29e9b56a9611e50a151749ca
\ No newline at end of file
diff --git a/db/schema_migrations/20231207221140 b/db/schema_migrations/20231207221140
new file mode 100644
index 00000000000..2048d3ef135
--- /dev/null
+++ b/db/schema_migrations/20231207221140
@@ -0,0 +1 @@
+4337e77f6342e8305f1e05d41aec0c0e1b65d9a420c2a16ad3f675715d700f4e
\ No newline at end of file
diff --git a/db/schema_migrations/20231207221241 b/db/schema_migrations/20231207221241
new file mode 100644
index 00000000000..4f79abaaf73
--- /dev/null
+++ b/db/schema_migrations/20231207221241
@@ -0,0 +1 @@
+821dbe95017a3ed54c3d0b994279587c85560869362da0ad41af130381fac73a
\ No newline at end of file
diff --git a/db/schema_migrations/20231207221300 b/db/schema_migrations/20231207221300
new file mode 100644
index 00000000000..32c160c1129
--- /dev/null
+++ b/db/schema_migrations/20231207221300
@@ -0,0 +1 @@
+a84c595c135dfccb69fff6c3c7c6e9b78ef080b9bed05479d8fb4f316171bde3
\ No newline at end of file