Add latest changes from gitlab-org/gitlab@master

2 files changed, 20 insertions, 1 deletions

diff --git a/db/post_migrate/20200226124757_remove_health_status_from_epics.rb b/db/post_migrate/20200226124757_remove_health_status_from_epics.rb
new file mode 100644
index 00000000000..e59edbacd2b
--- /dev/null
+++ b/db/post_migrate/20200226124757_remove_health_status_from_epics.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class RemoveHealthStatusFromEpics < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      remove_column :epics, :health_status
+    end
+  end
+
+  def down
+    with_lock_retries do
+      add_column :epics, :health_status, :integer, limit: 2
+    end
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 178cf4c63da..d5bd08b41d0 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -2271,7 +2271,6 @@ CREATE TABLE public.epics (
     state_id smallint DEFAULT 1 NOT NULL,
     start_date_sourcing_epic_id integer,
     due_date_sourcing_epic_id integer,
-    health_status smallint,
     external_key character varying(255)
 );
 
@@ -12819,6 +12818,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200226100614
 20200226100624
 20200226100634
+20200226124757
 20200226162156
 20200226162239
 20200226162634