Merge commit '64629eadb71afab79a741b016dc56a8bdf1d46f2' into glitch-soc/merge-upstream

db/migrate/20260310095021_add_description_html_to_collections.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddDescriptionHtmlToCollections < ActiveRecord::Migration[8.1]
+  def change
+    add_column :collections, :description_html, :text
+
+    reversible do |direction|
+      direction.up { change_column :collections, :description, :text, null: true }
+
+      direction.down { change_column :collections, :description, :text, null: false }
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2026_03_03_144409) do
+ActiveRecord::Schema[8.1].define(version: 2026_03_10_095021) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -387,7 +387,8 @@ ActiveRecord::Schema[8.1].define(version: 2026_03_03_144409) do
   create_table "collections", id: :bigint, default: -> { "timestamp_id('collections'::text)" }, force: :cascade do |t|
     t.bigint "account_id", null: false
     t.datetime "created_at", null: false
-    t.text "description", null: false
+    t.text "description"
+    t.text "description_html"
     t.boolean "discoverable", null: false
     t.integer "item_count", default: 0, null: false
     t.string "language"