Add latest changes from gitlab-org/gitlab@master

3 files changed, 19 insertions, 1 deletions

diff --git a/db/migrate/20200116051619_drop_activate_prometheus_services_for_shared_cluster_applications_background_migration.rb b/db/migrate/20200116051619_drop_background_migration_jobs.rb
index 39f450be716..f492ec0af9d 100644
--- a/db/migrate/20200116051619_drop_activate_prometheus_services_for_shared_cluster_applications_background_migration.rb
+++ b/db/migrate/20200116051619_drop_background_migration_jobs.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class DropActivatePrometheusServicesForSharedClusterApplicationsBackgroundMigration < ActiveRecord::Migration[5.2]
+class DropBackgroundMigrationJobs < ActiveRecord::Migration[5.2]
   include Gitlab::Database::MigrationHelpers
 
   DOWNTIME = false
diff --git a/db/migrate/20200131181354_add_health_status_to_epics.rb b/db/migrate/20200131181354_add_health_status_to_epics.rb
new file mode 100644
index 00000000000..4e5f9ab138d
--- /dev/null
+++ b/db/migrate/20200131181354_add_health_status_to_epics.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddHealthStatusToEpics < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :epics, :health_status, :integer, limit: 2
+  end
+end
diff --git a/db/migrate/20200131191754_add_health_status_to_issues.rb b/db/migrate/20200131191754_add_health_status_to_issues.rb
new file mode 100644
index 00000000000..ca4e797f4b7
--- /dev/null
+++ b/db/migrate/20200131191754_add_health_status_to_issues.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddHealthStatusToIssues < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :issues, :health_status, :integer, limit: 2
+  end
+end