Claire b9aa228c54 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream attempted something with tags. Kept our version.		2023-07-07 19:59:43 +02:00
..
account_associations.rb	Rewrite import feature (#21054)	2023-05-02 12:08:48 +02:00
account_avatar.rb
account_counters.rb
account_finder_concern.rb
account_header.rb
account_interactions.rb	Fix own posts not getting delivered to own lists (#24810)	2023-05-03 19:17:40 +02:00
account_merging.rb
account_search.rb	Revert "Rails 7 update" (#25667)	2023-07-02 11:14:22 +02:00
attachmentable.rb	Fix processing of media files with unusual names (#25788)	2023-07-07 13:35:22 +02:00
cacheable.rb
domain_materializable.rb
domain_normalizable.rb
expireable.rb
follow_limitable.rb
has_user_settings.rb	Migrate glitch-soc's exclusive user settings	2023-03-31 22:50:57 +02:00
ldap_authenticable.rb	Fix unescaped user input in LDAP query (#24379)	2023-04-04 12:42:38 +02:00
lockable.rb	Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method (#24741)	2023-05-02 18:16:07 +02:00
omniauthable.rb	Drop EOL Ruby 2.7 (#24237)	2023-04-27 01:46:18 +02:00
paginable.rb
pam_authenticable.rb
rate_limitable.rb
redisable.rb
relationship_cacheable.rb
remotable.rb
status_safe_reblog_insert.rb	Revert "Rails 7 update" (#25667)	2023-07-02 11:14:22 +02:00
status_snapshot_concern.rb
status_threading_concern.rb	Refactoring relations_map (#24195)	2023-03-21 10:32:58 +01:00