Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring

2022-12-15 20:25:25 +01:00

..

account_associations.rb

…

account_avatar.rb

Fix metadata scrubbing removing color profile from images (#20389)

2022-11-11 09:20:10 +01:00

account_counters.rb

…

account_finder_concern.rb

…

account_header.rb

Fix metadata scrubbing removing color profile from images (#20389)

2022-11-11 09:20:10 +01:00

account_interactions.rb

Add follow request banner on account header (#20785)

2022-12-15 18:50:11 +01:00

account_merging.rb

…

attachmentable.rb

…

cacheable.rb

…

domain_materializable.rb

Fix unbounded recursion in account discovery (#22025)

2022-12-07 00:15:24 +01:00

domain_normalizable.rb

Fix error when invalid domain name is submitted (#19474)

2022-11-14 08:07:14 +01:00

expireable.rb

…

follow_limitable.rb

…

ldap_authenticable.rb

…

lockable.rb

…

omniauthable.rb

…

paginable.rb

…

pam_authenticable.rb

…

rate_limitable.rb

…

redisable.rb

…

relationship_cacheable.rb

…

remotable.rb

…

status_snapshot_concern.rb

…

status_threading_concern.rb

…