Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		2022-05-01 16:52:27 +02:00
..
account_associations.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
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	Add remove from followers api (#16864)	2021-10-18 12:02:35 +02:00
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
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	Fix opening and closing Redis connections instead of using a pool (#18171)	2022-04-29 22:43:07 +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