Add latest changes from gitlab-org/gitlab@master

8 files changed, 68 insertions, 0 deletions

diff --git a/db/post_migrate/20230717144729_drop_ci_job_artifacts_partition_id_default_v2.rb b/db/post_migrate/20230717144729_drop_ci_job_artifacts_partition_id_default_v2.rb
new file mode 100644
index 00000000000..a3b2cd324fb
--- /dev/null
+++ b/db/post_migrate/20230717144729_drop_ci_job_artifacts_partition_id_default_v2.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class DropCiJobArtifactsPartitionIdDefaultV2 < Gitlab::Database::Migration[2.1]
+  enable_lock_retries!
+
+  TABLE_NAME = :ci_job_artifacts
+  COLUMN_NAME = :partition_id
+
+  def up
+    remove_column_default(TABLE_NAME, COLUMN_NAME)
+  end
+
+  def down
+    change_column_default(TABLE_NAME, COLUMN_NAME, from: nil, to: 100)
+  end
+end
diff --git a/db/post_migrate/20230717144744_drop_ci_stages_partition_id_default_v2.rb b/db/post_migrate/20230717144744_drop_ci_stages_partition_id_default_v2.rb
new file mode 100644
index 00000000000..d32b8718281
--- /dev/null
+++ b/db/post_migrate/20230717144744_drop_ci_stages_partition_id_default_v2.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class DropCiStagesPartitionIdDefaultV2 < Gitlab::Database::Migration[2.1]
+  enable_lock_retries!
+
+  TABLE_NAME = :ci_stages
+  COLUMN_NAME = :partition_id
+
+  def up
+    remove_column_default(TABLE_NAME, COLUMN_NAME)
+  end
+
+  def down
+    change_column_default(TABLE_NAME, COLUMN_NAME, from: nil, to: 100)
+  end
+end
diff --git a/db/post_migrate/20230717144802_drop_ci_build_trace_metadata_partition_id_default_v2.rb b/db/post_migrate/20230717144802_drop_ci_build_trace_metadata_partition_id_default_v2.rb
new file mode 100644
index 00000000000..e189801c79b
--- /dev/null
+++ b/db/post_migrate/20230717144802_drop_ci_build_trace_metadata_partition_id_default_v2.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class DropCiBuildTraceMetadataPartitionIdDefaultV2 < Gitlab::Database::Migration[2.1]
+  enable_lock_retries!
+
+  TABLE_NAME = :ci_build_trace_metadata
+  COLUMN_NAME = :partition_id
+
+  def up
+    remove_column_default(TABLE_NAME, COLUMN_NAME)
+  end
+
+  def down
+    change_column_default(TABLE_NAME, COLUMN_NAME, from: nil, to: 100)
+  end
+end
diff --git a/db/post_migrate/20230717144817_drop_ci_pipeline_variable_partition_id_default_v2.rb b/db/post_migrate/20230717144817_drop_ci_pipeline_variable_partition_id_default_v2.rb
new file mode 100644
index 00000000000..c75c0226b15
--- /dev/null
+++ b/db/post_migrate/20230717144817_drop_ci_pipeline_variable_partition_id_default_v2.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class DropCiPipelineVariablePartitionIdDefaultV2 < Gitlab::Database::Migration[2.1]
+  enable_lock_retries!
+
+  TABLE_NAME = :ci_pipeline_variables
+  COLUMN_NAME = :partition_id
+
+  def up
+    remove_column_default(TABLE_NAME, COLUMN_NAME)
+  end
+
+  def down
+    change_column_default(TABLE_NAME, COLUMN_NAME, from: nil, to: 100)
+  end
+end
diff --git a/db/schema_migrations/20230717144729 b/db/schema_migrations/20230717144729
new file mode 100644
index 00000000000..786c5fe295b
--- /dev/null
+++ b/db/schema_migrations/20230717144729
@@ -0,0 +1 @@
+a9264babc5e84597c2f8fb2fb2a3df4dceb0f6fe83877d18df03e679c77afa1b
\ No newline at end of file
diff --git a/db/schema_migrations/20230717144744 b/db/schema_migrations/20230717144744
new file mode 100644
index 00000000000..c643d8d90dc
--- /dev/null
+++ b/db/schema_migrations/20230717144744
@@ -0,0 +1 @@
+2ed2825eb5a1adaf1456096c84c0bc4016374e5525defa31b8c1393a8d864007
\ No newline at end of file
diff --git a/db/schema_migrations/20230717144802 b/db/schema_migrations/20230717144802
new file mode 100644
index 00000000000..12494fd2104
--- /dev/null
+++ b/db/schema_migrations/20230717144802
@@ -0,0 +1 @@
+eed3845b0321cdb69c7dfe8e54dda940362f1bc99405727eb252744cda254522
\ No newline at end of file
diff --git a/db/schema_migrations/20230717144817 b/db/schema_migrations/20230717144817
new file mode 100644
index 00000000000..d16daa2fad6
--- /dev/null
+++ b/db/schema_migrations/20230717144817
@@ -0,0 +1 @@
+18f72f73afe0fb027df28f6bc915f8afc1460258b08038055ee9c48a6d2bfbeb
\ No newline at end of file