Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 17 deletions

diff --git a/db/post_migrate/20190918104222_schedule_productivity_analytics_backfill.rb b/db/post_migrate/20190918104222_schedule_productivity_analytics_backfill.rb
index 3e1c77ae992..23d3bbbc395 100644
--- a/db/post_migrate/20190918104222_schedule_productivity_analytics_backfill.rb
+++ b/db/post_migrate/20190918104222_schedule_productivity_analytics_backfill.rb
@@ -5,24 +5,8 @@ class ScheduleProductivityAnalyticsBackfill < ActiveRecord::Migration[5.2]
 
   DOWNTIME = false
 
-  BATCH_SIZE = 10_000
-  INTERVAL = 3.minutes
-  MIGRATION = 'Gitlab::BackgroundMigration::RecalculateProductivityAnalytics'.freeze
-
-  disable_ddl_transaction!
-
   def up
-    return unless Gitlab.ee?
-
-    metrics_model = Class.new(ActiveRecord::Base) do
-      self.table_name = 'merge_request_metrics'
-
-      include ::EachBatch
-    end
-
-    scope = metrics_model.where("merged_at >= ?", 3.months.ago)
-
-    queue_background_migration_jobs_by_range_at_intervals(scope, MIGRATION, INTERVAL, batch_size: BATCH_SIZE)
+    # no-op since the scheduling times out on GitLab.com
   end
 
   def down