Claire 11902d958f Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Upstream added a new helper for a setting, where glitch-soc had extra ones.
  Not a real conflict, added upstream's new helper without removing glitch-soc's ones.

2025-08-09 23:02:43 +02:00

..

migrate

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

2025-08-09 23:02:43 +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

Change follow recommendation materialized view to be faster in most cases (#26545)

2023-08-18 18:20:55 +02:00

schema.rb

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

2025-08-09 23:02:43 +02:00

seeds.rb

Fix Rails/RootPathnameMethods cop (#31582)

2024-08-26 07:35:07 +00:00