Add latest changes from gitlab-org/gitlab@master

3 files changed, 16 insertions, 2 deletions

diff --git a/db/post_migrate/20230503032750_remove_redundant_index_from_container_repositories.rb b/db/post_migrate/20230503032750_remove_redundant_index_from_container_repositories.rb
new file mode 100644
index 00000000000..a538dc054bb
--- /dev/null
+++ b/db/post_migrate/20230503032750_remove_redundant_index_from_container_repositories.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class RemoveRedundantIndexFromContainerRepositories < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_container_repositories_on_project_id'
+
+  def up
+    remove_concurrent_index_by_name :container_repositories, INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index :container_repositories, :project_id, name: INDEX_NAME
+  end
+end
diff --git a/db/schema_migrations/20230503032750 b/db/schema_migrations/20230503032750
new file mode 100644
index 00000000000..fd4a7dff047
--- /dev/null
+++ b/db/schema_migrations/20230503032750
@@ -0,0 +1 @@
+1d8dc513156e6fcdfdd8670eb92c67fc261135527398310a089b8d6c5d70c213
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 7f07a820220..ce4aadefaeb 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -30482,8 +30482,6 @@ CREATE INDEX index_container_repositories_on_greatest_completed_at ON container_
 
 CREATE INDEX index_container_repositories_on_migration_state_import_done_at ON container_repositories USING btree (migration_state, migration_import_done_at);
 
-CREATE INDEX index_container_repositories_on_project_id ON container_repositories USING btree (project_id);
-
 CREATE INDEX index_container_repositories_on_project_id_and_id ON container_repositories USING btree (project_id, id);
 
 CREATE UNIQUE INDEX index_container_repositories_on_project_id_and_name ON container_repositories USING btree (project_id, name);