Merge remote-tracking branch 'glitch/main'

Not at all sure where the admin UI is going to display English language
names now but OK.

2 files changed, 7 insertions, 1 deletions

diff --git a/db/migrate/20220209175231_add_content_type_to_status_edits.rb b/db/migrate/20220209175231_add_content_type_to_status_edits.rb
new file mode 100644
index 000000000..0e4e52fcb
--- /dev/null
+++ b/db/migrate/20220209175231_add_content_type_to_status_edits.rb
@@ -0,0 +1,5 @@
+class AddContentTypeToStatusEdits < ActiveRecord::Migration[6.1]
+  def change
+    add_column :status_edits, :content_type, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ff28f7a7f..252373a7c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_01_18_183123) do
+ActiveRecord::Schema.define(version: 2022_02_09_175231) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -824,6 +824,7 @@ ActiveRecord::Schema.define(version: 2022_01_18_183123) do
     t.boolean "media_attachments_changed", default: false, null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.string "content_type"
     t.index ["account_id"], name: "index_status_edits_on_account_id"
     t.index ["status_id"], name: "index_status_edits_on_status_id"
   end