Add latest changes from gitlab-org/gitlab@master

3 files changed, 21 insertions, 0 deletions

diff --git a/db/migrate/20240109031624_add_unique_index_to_system_note_metadata_on_id_convert_to_bigint.rb b/db/migrate/20240109031624_add_unique_index_to_system_note_metadata_on_id_convert_to_bigint.rb
new file mode 100644
index 00000000000..d48832705af
--- /dev/null
+++ b/db/migrate/20240109031624_add_unique_index_to_system_note_metadata_on_id_convert_to_bigint.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddUniqueIndexToSystemNoteMetadataOnIdConvertToBigint < Gitlab::Database::Migration[2.2]
+  disable_ddl_transaction!
+
+  milestone '16.9'
+
+  TABLE_NAME = :system_note_metadata
+  INDEX_NAME = 'index_system_note_metadata_pkey_on_id_convert_to_bigint'
+
+  def up
+    add_concurrent_index TABLE_NAME, :id_convert_to_bigint, unique: true, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index TABLE_NAME, :id_convert_to_bigint, unique: true, name: INDEX_NAME
+  end
+end
diff --git a/db/schema_migrations/20240109031624 b/db/schema_migrations/20240109031624
new file mode 100644
index 00000000000..8210a8dc762
--- /dev/null
+++ b/db/schema_migrations/20240109031624
@@ -0,0 +1 @@
+eaa86ad90ae101a641f30090941d0a993fa0bd92709ed429d8f23ea5b91c04c7
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 7d07dfd2287..4102ce44c63 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -35471,6 +35471,8 @@ CREATE UNIQUE INDEX index_system_note_metadata_on_description_version_id ON syst
 
 CREATE UNIQUE INDEX index_system_note_metadata_on_note_id ON system_note_metadata USING btree (note_id);
 
+CREATE UNIQUE INDEX index_system_note_metadata_pkey_on_id_convert_to_bigint ON system_note_metadata USING btree (id_convert_to_bigint);
+
 CREATE INDEX index_taggings_on_tag_id ON taggings USING btree (tag_id);
 
 CREATE INDEX index_taggings_on_taggable_id_and_taggable_type_and_context ON taggings USING btree (taggable_id, taggable_type, context);