Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.

2024-04-06 21:01:40 +02:00

..

account

Reattribute notification-related records if possible when merging accounts (#29694)

2024-03-22 16:21:53 +00:00

status

Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream

2024-03-14 17:27:16 +01:00

user

Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream

2024-04-06 21:01:40 +02:00

attachmentable.rb

Fix .opus file uploads being misidentified by Paperclip (#28580)

2024-01-03 19:02:53 +00:00

browser_detection.rb

Add BrowserDetection model concern (#29513)

2024-03-19 15:39:14 +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

Extract by_domain_length scope in DomainNormalizable concern (#29517)

2024-03-12 13:09:11 +00: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

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 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