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.
This commit is contained in:
Claire
2025-05-25 14:38:25 +02:00
53 changed files with 1342 additions and 371 deletions

View File

@@ -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