Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 2 deletions

diff --git a/db/post_migrate/20230316014651_remove_index_on_events_action.rb b/db/post_migrate/20230316014651_remove_index_on_events_action.rb
new file mode 100644
index 00000000000..61a3077c330
--- /dev/null
+++ b/db/post_migrate/20230316014651_remove_index_on_events_action.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RemoveIndexOnEventsAction < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  def up
+    remove_concurrent_index :events, :action, name: 'index_events_on_action'
+  end
+
+  def down
+    add_concurrent_index :events, :action, name: 'index_events_on_action'
+  end
+end
diff --git a/db/schema_migrations/20230316014651 b/db/schema_migrations/20230316014651
new file mode 100644
index 00000000000..70d7cbcef00
--- /dev/null
+++ b/db/schema_migrations/20230316014651
@@ -0,0 +1 @@
+f139b8097744ab3fabdf343bfb5e6a7a8426227b54238c4926b0446dd621ef64
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 93aeb7d1a47..892a39ee338 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -30580,8 +30580,6 @@ CREATE INDEX index_events_for_group_activity ON events USING btree (group_id, ta
 
 CREATE INDEX index_events_for_project_activity ON events USING btree (project_id, target_type, action, id);
 
-CREATE INDEX index_events_on_action ON events USING btree (action);
-
 CREATE INDEX index_events_on_author_id_and_created_at ON events USING btree (author_id, created_at);
 
 CREATE INDEX index_events_on_author_id_and_created_at_merge_requests ON events USING btree (author_id, created_at) WHERE ((target_type)::text = 'MergeRequest'::text);