Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.		2022-11-12 13:28:03 +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 ability to filter followed accounts' posts by language (#19095)	2022-09-20 23:51:21 +02:00
account_merging.rb
attachmentable.rb
cacheable.rb
domain_materializable.rb
domain_normalizable.rb
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	Remove dead code and refactor status threading code (#20357)	2022-11-10 22:30:00 +01:00