Commit graph

4 commits

Author SHA1 Message Date
Claire
f55959ebd9 Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
Eugen Rochko
1c28a202fe Remove 16:9 cropping from web UI (#26132) 2023-07-24 13:46:55 +02:00
Claire
bb5b3182f0 Migrate glitch-soc's exclusive user settings 2023-03-31 22:50:57 +02:00
Eugen Rochko
c75fccf033 Change user settings to be stored in a more optimal way (#23630)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30 14:44:00 +02:00