Merge commit '90f7b90223ce3212a2bb9746a119bcc9287b3237' into glitch-soc/merge-upstream

Conflicts:
- `yarn.lock`:
  Upstream updated dependencies, including one textually adjacent to a
  glitch-soc-only dependency.
  Updated dependencies as upstream did.

db/migrate/20250428104538_add_require_tos_interstitial_to_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRequireTosInterstitialToUsers < ActiveRecord::Migration[8.0]
+  def change
+    add_column :users, :require_tos_interstitial, :boolean, null: false, default: false
+  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.0].define(version: 2025_04_28_095029) do
+ActiveRecord::Schema[8.0].define(version: 2025_04_28_104538) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -1250,6 +1250,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_04_28_095029) do
     t.string "time_zone"
     t.string "otp_secret"
     t.datetime "age_verified_at"
+    t.boolean "require_tos_interstitial", default: false, null: false
     t.index ["account_id"], name: "index_users_on_account_id"
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id", where: "(created_by_application_id IS NOT NULL)"