Add latest changes from gitlab-org/gitlab@master

5 files changed, 27 insertions, 0 deletions

diff --git a/db/migrate/20211021115409_add_color_to_epics.rb b/db/migrate/20211021115409_add_color_to_epics.rb
new file mode 100644
index 00000000000..14b38209f30
--- /dev/null
+++ b/db/migrate/20211021115409_add_color_to_epics.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddColorToEpics < Gitlab::Database::Migration[1.0]
+  # rubocop:disable Migration/AddLimitToTextColumns
+  # limit is added in 20211021124715_add_text_limit_to_epics_color
+  def change
+    add_column :epics, :color, :text, default: '#1068bf'
+  end
+  # rubocop:enable Migration/AddLimitToTextColumns
+end
diff --git a/db/migrate/20211021124715_add_text_limit_to_epics_color.rb b/db/migrate/20211021124715_add_text_limit_to_epics_color.rb
new file mode 100644
index 00000000000..7844575c521
--- /dev/null
+++ b/db/migrate/20211021124715_add_text_limit_to_epics_color.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddTextLimitToEpicsColor < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  def up
+    add_text_limit :epics, :color, 7
+  end
+
+  def down
+    remove_text_limit :epics, :color
+  end
+end
diff --git a/db/schema_migrations/20211021115409 b/db/schema_migrations/20211021115409
new file mode 100644
index 00000000000..bcbed298377
--- /dev/null
+++ b/db/schema_migrations/20211021115409
@@ -0,0 +1 @@
+93960203e6703716f9c513dca340e17041a33792f9233dc4b7e35d1e19614191
\ No newline at end of file
diff --git a/db/schema_migrations/20211021124715 b/db/schema_migrations/20211021124715
new file mode 100644
index 00000000000..2d03c608bac
--- /dev/null
+++ b/db/schema_migrations/20211021124715
@@ -0,0 +1 @@
+406af18458c7f5ee8a4fa3860ed5fb87c358363926fed2830be8e8a55578822b
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 111cb4ca521..d402eeb51e2 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -14722,6 +14722,8 @@ CREATE TABLE epics (
     due_date_sourcing_epic_id integer,
     confidential boolean DEFAULT false NOT NULL,
     external_key character varying(255),
+    color text DEFAULT '#1068bf'::text,
+    CONSTRAINT check_ca608c40b3 CHECK ((char_length(color) <= 7)),
     CONSTRAINT check_fcfb4a93ff CHECK ((lock_version IS NOT NULL))
 );