Add latest changes from gitlab-org/gitlab@master

3 files changed, 17 insertions, 0 deletions

diff --git a/db/post_migrate/20220505193512_add_not_null_constraint_to_issues_work_item_type.rb b/db/post_migrate/20220505193512_add_not_null_constraint_to_issues_work_item_type.rb
new file mode 100644
index 00000000000..3ea003383a6
--- /dev/null
+++ b/db/post_migrate/20220505193512_add_not_null_constraint_to_issues_work_item_type.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddNotNullConstraintToIssuesWorkItemType < Gitlab::Database::Migration[2.0]
+  disable_ddl_transaction!
+
+  def up
+    add_not_null_constraint :issues, :work_item_type_id, validate: false
+  end
+
+  def down
+    remove_not_null_constraint :issues, :work_item_type_id
+  end
+end
diff --git a/db/schema_migrations/20220505193512 b/db/schema_migrations/20220505193512
new file mode 100644
index 00000000000..635cf9dd443
--- /dev/null
+++ b/db/schema_migrations/20220505193512
@@ -0,0 +1 @@
+bad94788a101a4567442e4e5a008896323ef00f7c0a98e4439e3b58e2095f30e
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 5fea5ed9391..d9d721a6b69 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -24111,6 +24111,9 @@ ALTER TABLE ONLY chat_names
 ALTER TABLE ONLY chat_teams
     ADD CONSTRAINT chat_teams_pkey PRIMARY KEY (id);
 
+ALTER TABLE issues
+    ADD CONSTRAINT check_2addf801cd CHECK ((work_item_type_id IS NOT NULL)) NOT VALID;
+
 ALTER TABLE vulnerability_scanners
     ADD CONSTRAINT check_37608c9db5 CHECK ((char_length(vendor) <= 255)) NOT VALID;