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

Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Upstream removed a line close to one modified by glitch-soc.
  Removed the line as upstream did.

2023-01-14 22:34:09 +01:00

..

account_associations.rb

…

account_avatar.rb

…

account_counters.rb

…

account_finder_concern.rb

…

account_header.rb

…

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

Don't crash on unobtainable avatars (#22462)

2023-01-13 16:40:06 +01:00

paginable.rb

…

pam_authenticable.rb

…

rate_limitable.rb

…

redisable.rb

…

relationship_cacheable.rb

…

remotable.rb

…

status_snapshot_concern.rb

…

status_threading_concern.rb

…