Add latest changes from gitlab-org/gitlab@master

5 files changed, 31 insertions, 3 deletions

diff --git a/db/migrate/20220808194857_remove_description_html_limit.rb b/db/migrate/20220808194857_remove_description_html_limit.rb
new file mode 100644
index 00000000000..f7444594566
--- /dev/null
+++ b/db/migrate/20220808194857_remove_description_html_limit.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class RemoveDescriptionHtmlLimit < Gitlab::Database::Migration[2.0]
+  disable_ddl_transaction!
+
+  def up
+    remove_text_limit :namespace_details, :description_html
+    remove_text_limit :namespace_details, :description
+  end
+
+  def down
+    add_text_limit :namespace_details, :description_html, 255
+    add_text_limit :namespace_details, :description, 255
+  end
+end
diff --git a/db/post_migrate/20220808072054_prepare_index_removal_security_findings.rb b/db/post_migrate/20220808072054_prepare_index_removal_security_findings.rb
new file mode 100644
index 00000000000..eb4158fa9dd
--- /dev/null
+++ b/db/post_migrate/20220808072054_prepare_index_removal_security_findings.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class PrepareIndexRemovalSecurityFindings < Gitlab::Database::Migration[2.0]
+  INDEX_NAME = :index_on_security_findings_uuid_and_id_order_desc
+
+  def up
+    prepare_async_index_removal :security_findings, [:uuid, :id], name: INDEX_NAME
+  end
+
+  def down
+    unprepare_async_index_by_name :security_findings, INDEX_NAME
+  end
+end
diff --git a/db/schema_migrations/20220808072054 b/db/schema_migrations/20220808072054
new file mode 100644
index 00000000000..93ef145ba92
--- /dev/null
+++ b/db/schema_migrations/20220808072054
@@ -0,0 +1 @@
+5e489655875408b2879f44f006b420a62554e6523ca687cfa64485e0123fc25c
\ No newline at end of file
diff --git a/db/schema_migrations/20220808194857 b/db/schema_migrations/20220808194857
new file mode 100644
index 00000000000..10a35a98cb2
--- /dev/null
+++ b/db/schema_migrations/20220808194857
@@ -0,0 +1 @@
+12e5d5c0cb73c8c2fdde4f640a57ab9c70d2e41382bd6eb2e2d36c1018f299ef
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 5b6e41a5315..570756911c9 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -17642,9 +17642,7 @@ CREATE TABLE namespace_details (
     updated_at timestamp with time zone,
     cached_markdown_version integer,
     description text,
-    description_html text,
-    CONSTRAINT check_2df620eaf6 CHECK ((char_length(description_html) <= 255)),
-    CONSTRAINT check_2f563eec0f CHECK ((char_length(description) <= 255))
+    description_html text
 );
 
 CREATE TABLE namespace_limits (