Claire 040b7d37a4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict due to glitch-soc having extra code for a proper direct visibility timeline, in a part of the code upstream refactored. Restored glitch-soc's extra code in the refactored bit.		2022-05-16 09:42:32 +02:00
..
account_associations.rb
account_avatar.rb
account_counters.rb
account_finder_concern.rb	Fix instance actor being incorrectly created when running migrations (#18109)	2022-04-26 21:22:09 +02:00
account_header.rb
account_interactions.rb
account_merging.rb	Update fix-duplicates maintenance task (#17731)	2022-03-12 08:33:11 +01:00
attachmentable.rb
cacheable.rb
domain_materializable.rb
domain_normalizable.rb
expireable.rb
follow_limitable.rb
ldap_authenticable.rb
lockable.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
omniauthable.rb	Allow login through OpenID Connect (#16221)	2022-03-09 12:07:35 +01:00
paginable.rb
pam_authenticable.rb
rate_limitable.rb
redisable.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
relationship_cacheable.rb
remotable.rb
status_snapshot_concern.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-26 19:18:55 +01:00
status_threading_concern.rb
user_roles.rb