Add latest changes from gitlab-org/gitlab@master

2 files changed, 28 insertions, 0 deletions

diff --git a/db/post_migrate/20200220115023_fix_projects_without_prometheus_service.rb b/db/post_migrate/20200220115023_fix_projects_without_prometheus_service.rb
new file mode 100644
index 00000000000..274a392a52a
--- /dev/null
+++ b/db/post_migrate/20200220115023_fix_projects_without_prometheus_service.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class FixProjectsWithoutPrometheusService < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  BATCH_SIZE = 50_000
+  MIGRATION = 'FixProjectsWithoutPrometheusService'
+
+  disable_ddl_transaction!
+
+  class Project < ActiveRecord::Base
+    include EachBatch
+  end
+
+  def up
+    queue_background_migration_jobs_by_range_at_intervals(Project, MIGRATION, 2.minutes, batch_size: BATCH_SIZE)
+  end
+
+  def down
+    # no-op
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index f8c3e1d92b9..505050397da 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -12747,6 +12747,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200219184219
 20200219193058
 20200219193117
+20200220115023
 20200220180944
 20200221023320
 20200221074028