Add latest changes from gitlab-org/gitlab@master

5 files changed, 36 insertions, 0 deletions

diff --git a/db/post_migrate/20230502102833_add_index_to_members_on_source_and_type_and_access_level.rb b/db/post_migrate/20230502102833_add_index_to_members_on_source_and_type_and_access_level.rb
new file mode 100644
index 00000000000..29960856299
--- /dev/null
+++ b/db/post_migrate/20230502102833_add_index_to_members_on_source_and_type_and_access_level.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddIndexToMembersOnSourceAndTypeAndAccessLevel < Gitlab::Database::Migration[2.1]
+  INDEX_NAME = 'index_members_on_source_and_type_and_access_level'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :members, %i[source_id source_type type access_level], name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :members, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20230502120022_add_index_to_project_authorizations_on_project_user_access_level.rb b/db/post_migrate/20230502120022_add_index_to_project_authorizations_on_project_user_access_level.rb
new file mode 100644
index 00000000000..3f8561b2be7
--- /dev/null
+++ b/db/post_migrate/20230502120022_add_index_to_project_authorizations_on_project_user_access_level.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddIndexToProjectAuthorizationsOnProjectUserAccessLevel < Gitlab::Database::Migration[2.1]
+  INDEX_NAME = 'index_project_authorizations_on_project_user_access_level'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :project_authorizations, %i[project_id user_id access_level], name: INDEX_NAME, unique: true
+  end
+
+  def down
+    remove_concurrent_index_by_name :project_authorizations, INDEX_NAME
+  end
+end
diff --git a/db/schema_migrations/20230502102833 b/db/schema_migrations/20230502102833
new file mode 100644
index 00000000000..f9629db7788
--- /dev/null
+++ b/db/schema_migrations/20230502102833
@@ -0,0 +1 @@
+d977e336cc71f43157c2d87c529706abe50cb962fcf2e36c2fd315135c881440
\ No newline at end of file
diff --git a/db/schema_migrations/20230502120022 b/db/schema_migrations/20230502120022
new file mode 100644
index 00000000000..abc7f157f88
--- /dev/null
+++ b/db/schema_migrations/20230502120022
@@ -0,0 +1 @@
+576982c8efcf40da159f3f721cf6b2947e61e92637f861c031d3731ddeaf2d05
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 50b15accfc5..19d71325370 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -31304,6 +31304,8 @@ CREATE INDEX index_members_on_member_role_id ON members USING btree (member_role
 
 CREATE INDEX index_members_on_requested_at ON members USING btree (requested_at);
 
+CREATE INDEX index_members_on_source_and_type_and_access_level ON members USING btree (source_id, source_type, type, access_level);
+
 CREATE INDEX index_members_on_source_id_and_source_type ON members USING btree (source_id, source_type);
 
 CREATE INDEX index_members_on_source_state_type_access_level_and_user_id ON members USING btree (source_id, source_type, state, type, access_level, user_id) WHERE ((requested_at IS NULL) AND (invite_token IS NULL));
@@ -31930,6 +31932,8 @@ CREATE UNIQUE INDEX index_project_aliases_on_name ON project_aliases USING btree
 
 CREATE INDEX index_project_aliases_on_project_id ON project_aliases USING btree (project_id);
 
+CREATE UNIQUE INDEX index_project_authorizations_on_project_user_access_level ON project_authorizations USING btree (project_id, user_id, access_level);
+
 CREATE UNIQUE INDEX index_project_auto_devops_on_project_id ON project_auto_devops USING btree (project_id);
 
 CREATE UNIQUE INDEX index_project_build_artifacts_size_refreshes_on_project_id ON project_build_artifacts_size_refreshes USING btree (project_id);