Add latest changes from gitlab-org/gitlab@master

5 files changed, 48 insertions, 0 deletions

diff --git a/db/post_migrate/20220630091409_add_index_on_events_for_contribution_analytics_optimization.rb b/db/post_migrate/20220630091409_add_index_on_events_for_contribution_analytics_optimization.rb
new file mode 100644
index 00000000000..de16b17f489
--- /dev/null
+++ b/db/post_migrate/20220630091409_add_index_on_events_for_contribution_analytics_optimization.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddIndexOnEventsForContributionAnalyticsOptimization < Gitlab::Database::Migration[2.0]
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_on_events_to_improve_contribution_analytics_performance'
+
+  def up
+    add_concurrent_index :events, [:project_id, :target_type, :action, :created_at, :author_id, :id], name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :events, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20220630151641_schedule_set_correct_vulnerability_state.rb b/db/post_migrate/20220630151641_schedule_set_correct_vulnerability_state.rb
new file mode 100644
index 00000000000..7c9211ff282
--- /dev/null
+++ b/db/post_migrate/20220630151641_schedule_set_correct_vulnerability_state.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class ScheduleSetCorrectVulnerabilityState < Gitlab::Database::Migration[2.0]
+  disable_ddl_transaction!
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  MAX_BATCH_SIZE = 5_000
+  JOB_INTERVAL = 2.minutes
+  MIGRATION_NAME = 'SetCorrectVulnerabilityState'
+  BATCH_CLASS_NAME = 'DismissedVulnerabilitiesStrategy'
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION_NAME,
+      :vulnerabilities,
+      :id,
+      job_interval: JOB_INTERVAL,
+      batch_size: MAX_BATCH_SIZE,
+      max_batch_size: MAX_BATCH_SIZE,
+      batch_class_name: BATCH_CLASS_NAME,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(MIGRATION_NAME, :vulnerabilities, :id, [])
+  end
+end
diff --git a/db/schema_migrations/20220630091409 b/db/schema_migrations/20220630091409
new file mode 100644
index 00000000000..e36a91febe6
--- /dev/null
+++ b/db/schema_migrations/20220630091409
@@ -0,0 +1 @@
+f8c8489ecded214bbc4ab615a23eceaef3b6f650e98514f8e2b4b2fa6d328f4e
\ No newline at end of file
diff --git a/db/schema_migrations/20220630151641 b/db/schema_migrations/20220630151641
new file mode 100644
index 00000000000..f32c607c840
--- /dev/null
+++ b/db/schema_migrations/20220630151641
@@ -0,0 +1 @@
+55794a6bb6380adc662fb90f60596477ff81d83b05b4cca83d72332d869d08fb
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 28bef98631b..f8806c08e32 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -28919,6 +28919,8 @@ CREATE INDEX index_on_dingtalk_tracker_data_corpid ON dingtalk_tracker_data USIN
 
 COMMENT ON INDEX index_on_dingtalk_tracker_data_corpid IS 'JiHu-specific index';
 
+CREATE INDEX index_on_events_to_improve_contribution_analytics_performance ON events USING btree (project_id, target_type, action, created_at, author_id, id);
+
 CREATE INDEX index_on_group_id_on_webhooks ON web_hooks USING btree (group_id);
 
 CREATE INDEX index_on_identities_lower_extern_uid_and_provider ON identities USING btree (lower((extern_uid)::text), provider);