Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 0 deletions

diff --git a/db/migrate/20200330121000_add_confidential_attribute_to_epics.rb b/db/migrate/20200330121000_add_confidential_attribute_to_epics.rb
new file mode 100644
index 00000000000..01728436b93
--- /dev/null
+++ b/db/migrate/20200330121000_add_confidential_attribute_to_epics.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddConfidentialAttributeToEpics < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:epics, :confidential, :boolean, default: false)
+  end
+
+  def down
+    remove_column(:epics, :confidential)
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index d9062b0f3e1..94d98c68f48 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -2271,6 +2271,7 @@ CREATE TABLE public.epics (
     state_id smallint DEFAULT 1 NOT NULL,
     start_date_sourcing_epic_id integer,
     due_date_sourcing_epic_id integer,
+    confidential boolean DEFAULT false NOT NULL,
     external_key character varying(255)
 );
 
@@ -12925,6 +12926,7 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200326144443
 20200326145443
 20200330074719
+20200330121000
 20200330132913
 20200331220930
 \.