Jeremy Kescher 009251a17d Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/mastodon/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/initial_state.js # app/serializers/initial_state_serializer.rb # config/initializers/chewy.rb # config/locales/en.yml # config/locales/ja.yml		2024-02-24 19:11:05 +01:00
..
account	Merge branch 'glitch-soc' into develop	2024-02-24 19:11:05 +01:00
status	Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream	2023-12-20 22:05:31 +01:00
user	Merge branch 'glitch-soc' into develop	2024-02-14 18:02:38 +01:00
attachmentable.rb	Fix .opus file uploads being misidentified by Paperclip (#28580)	2024-01-03 19:02:53 +00:00
cacheable.rb	Fix cache_associated no longer working (#7320)	2018-05-03 10:41:41 +02:00
database_view_record.rb	Extract scenic view model common methods to concern (#28111)	2024-02-06 09:08:07 +00:00
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	Fix being able to import more than allowed number of follows (#15384)	2020-12-26 23:52:46 +01: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
paginable.rb	Autofix Rubocop Style/Lambda (#23696)	2023-02-18 12:39:00 +01:00
rate_limitable.rb	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
redisable.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
relationship_cacheable.rb	Fix call to inefficient delete_matched cache method in domain blocks (#28374)	2023-12-18 16:14:43 +00:00
remotable.rb	Fix Performance/StringIdentifierArgument cop (#28508)	2023-12-29 10:23:30 +00:00