Add latest changes from gitlab-org/gitlab@master

3 files changed, 15 insertions, 0 deletions

diff --git a/db/migrate/20230718234602_add_patch_id_to_merge_request_diffs.rb b/db/migrate/20230718234602_add_patch_id_to_merge_request_diffs.rb
new file mode 100644
index 00000000000..f67ffc60513
--- /dev/null
+++ b/db/migrate/20230718234602_add_patch_id_to_merge_request_diffs.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddPatchIdToMergeRequestDiffs < Gitlab::Database::Migration[2.1]
+  enable_lock_retries!
+
+  def up
+    add_column :merge_request_diffs, :patch_id_sha, :binary
+  end
+
+  def down
+    remove_column :merge_request_diffs, :patch_id_sha
+  end
+end
diff --git a/db/schema_migrations/20230718234602 b/db/schema_migrations/20230718234602
new file mode 100644
index 00000000000..55c89acbdae
--- /dev/null
+++ b/db/schema_migrations/20230718234602
@@ -0,0 +1 @@
+b42c91e49c4c0d5459f07838887662f7fe66fe8e1149fd864be384ccae1be9a2
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index d1d26f4abd3..f7b93fe07bf 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -18244,6 +18244,7 @@ CREATE TABLE merge_request_diffs (
     files_count smallint,
     sorted boolean DEFAULT false NOT NULL,
     diff_type smallint DEFAULT 1 NOT NULL,
+    patch_id_sha bytea,
     CONSTRAINT check_93ee616ac9 CHECK ((external_diff_store IS NOT NULL))
 );