Claire 0d69cc068c Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3 ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/trends/statuses.rb`: Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions. Added the date restriction to glitch-soc's conditions.		2024-12-02 21:49:12 +01:00
..
account	Fix `TagFollow` records not being correctly handled in account operations (#33063)	2024-12-02 16:20:32 +01:00
status	Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream	2024-05-06 17:53:51 +02:00
user	Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream	2024-07-12 13:41:54 +02:00
attachmentable.rb	Add support for libvips in addition to ImageMagick (#30090)	2024-06-05 19:15:39 +00:00
browser_detection.rb	Add `BrowserDetection` model concern (#29513)	2024-03-19 15:39:14 +00:00
cacheable.rb	Remove caching in `cache_collection` (#29862)	2024-04-08 13:46:13 +00:00
custom_filter_cache.rb	Extract shared callback behaviour to `CustomFilterCache` concern (#29695)	2024-04-05 09:17:58 +00: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	Extract `by_domain_length` scope in `DomainNormalizable` concern (#29517)	2024-03-12 13:09:11 +00:00
expireable.rb	Fix `Rails/WhereRange` cop (#30343)	2024-05-20 09:37:36 +00:00
follow_limitable.rb	Fix being able to import more than allowed number of follows (#15384)	2020-12-26 23:52:46 +01:00
legacy_otp_secret.rb	Update `devise-two-factor` to version 5.0.0 (#28325)	2024-05-02 09:31:41 +00: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
ranked_trend.rb	Add `RankedTrend` concern for trends classes (#29388)	2024-02-26 13:45:39 +00:00
rate_limitable.rb	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
redisable.rb	Refactor (ruby) redis configuration (#31694)	2024-09-02 14:19:55 +00: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
reviewable.rb	Add `reviewed` and `unreviewed` scopes to `Reviewable` model concern (#31988)	2024-09-20 08:51:37 +00:00