Claire e8fe33f273 Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's theming system.
  Updated the line as upstream did.

2025-08-25 22:15:28 +02:00

..

migrate

Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream

2025-08-25 22:15:28 +02:00

post_migrate

Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream

2025-06-25 19:29:09 +02:00

seeds

Add ability to block words in usernames (#35407)

2025-07-29 10:19:15 +00:00

views

…

schema.rb

Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream

2025-08-25 22:15:28 +02:00

seeds.rb

…