Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.		2023-02-09 12:46:12 +01:00
..
account_associations.rb
account_avatar.rb
account_counters.rb
account_finder_concern.rb	Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307)	2023-01-18 16:33:03 +01:00
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
domain_normalizable.rb
expireable.rb
follow_limitable.rb
ldap_authenticable.rb
lockable.rb
omniauthable.rb	Apply Rubocop Style/RedundantAssignment (#23452)	2023-02-08 07:06:50 +01:00
paginable.rb
pam_authenticable.rb
rate_limitable.rb
redisable.rb
relationship_cacheable.rb
remotable.rb	Autofix Rails/EagerEvaluationLogMessage (#23429)	2023-02-07 03:44:36 +01:00
status_snapshot_concern.rb
status_threading_concern.rb