Add latest changes from gitlab-org/gitlab@master

2 files changed, 34 insertions, 0 deletions

diff --git a/db/post_migrate/20231207211418_add_iid_namespace_unique_index_to_issues.rb b/db/post_migrate/20231207211418_add_iid_namespace_unique_index_to_issues.rb
new file mode 100644
index 00000000000..4c2439f33ea
--- /dev/null
+++ b/db/post_migrate/20231207211418_add_iid_namespace_unique_index_to_issues.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddIidNamespaceUniqueIndexToIssues < Gitlab::Database::Migration[2.2]
+  INDEX_NAME = 'index_issues_on_namespace_id_iid_unique'
+
+  disable_ddl_transaction!
+
+  milestone '16.8'
+
+  def up
+    add_concurrent_index :issues, [:namespace_id, :iid], name: INDEX_NAME, unique: true
+  end
+
+  def down
+    remove_concurrent_index_by_name :issues, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20231207221418_drop_namespace_id_index_on_issues.rb b/db/post_migrate/20231207221418_drop_namespace_id_index_on_issues.rb
new file mode 100644
index 00000000000..38df861de00
--- /dev/null
+++ b/db/post_migrate/20231207221418_drop_namespace_id_index_on_issues.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DropNamespaceIdIndexOnIssues < Gitlab::Database::Migration[2.2]
+  INDEX_NAME = 'index_issues_on_namespace_id'
+
+  disable_ddl_transaction!
+
+  milestone '16.8'
+
+  def up
+    remove_concurrent_index_by_name :issues, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index :issues, :namespace_id, name: INDEX_NAME
+  end
+end