Claire 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.		2023-07-13 13:35:15 +02:00
..
account_associations.rb	Rewrite import feature (#21054)	2023-05-02 12:08:48 +02:00
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	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	Fix metadata scrubbing removing color profile from images (#20389)	2022-11-11 09:20:10 +01:00
account_interactions.rb	Fix own posts not getting delivered to own lists (#24810)	2023-05-03 19:17:40 +02:00
account_merging.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
account_search.rb	Rails 7.0 update (#25668)	2023-07-13 09:36:07 +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	Fix unbounded recursion in account discovery (#22025)	2022-12-07 00:15:24 +01:00
domain_normalizable.rb	Fix error when invalid domain name is submitted (#19474)	2022-11-14 08:07:14 +01:00
expireable.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
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	Autofix Rubocop Style/Lambda (#23696)	2023-02-18 12:39:00 +01:00
pam_authenticable.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
rate_limitable.rb
redisable.rb
relationship_cacheable.rb
remotable.rb	Autofix Rails/EagerEvaluationLogMessage (#23429)	2023-02-07 03:44:36 +01:00
status_safe_reblog_insert.rb	Rails 7.0 update (#25668)	2023-07-13 09:36:07 +02:00
status_snapshot_concern.rb
status_threading_concern.rb	Refactoring relations_map (#24195)	2023-03-21 10:32:58 +01:00