Claire 2f491f0d48 Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6 ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version.
   Did it as well.

2026-06-23 18:01:59 +02:00

..

account

Fix incorrect value for feature_approval.current_user for local users (#38751)

2026-04-20 16:00:15 +00:00

fasp/provider

Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences (#37795)

2026-02-17 14:56:46 +00:00

favourite

Add support for FASP data sharing (#34415)

2025-05-16 12:24:02 +00:00

notification

Add server-side support for grouping account sign-up notifications (#34298)

2025-03-28 12:35:25 +00:00

status

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

2026-01-29 21:08:46 +01:00

user

Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6

2026-06-23 18:01:59 +02:00

attachmentable.rb

Update rubocop to version 1.76.0 (#34926)

2025-06-05 12:09:05 +00:00

browser_detection.rb

…

cacheable.rb

…

canonical_email.rb

Replace EmailHelper module with normalizes via model concern (#35702)

2025-08-07 13:47:47 +00:00

custom_filter_cache.rb

…

database_view_record.rb

Simplify DatabaseViewRecord.refresh (#35252)

2025-07-11 08:36:05 +00:00

domain_materializable.rb

…

domain_normalizable.rb

Add domain_variants helper to DomainNormalizable concern (#38539)

2026-04-17 15:36:09 +00:00

expireable.rb

…

follow_limitable.rb

Use ActiveModel::Attributes in FollowLimitable concern (#35327)

2025-07-10 07:40:56 +00:00

inet_container.rb

…

lockable.rb

…

paginable.rb

…

ranked_trend.rb

…

rate_limitable.rb

Use attribute for defining rate_limit boolean (#35555)

2025-07-28 08:08:31 +00:00

redisable.rb

…

relationship_cacheable.rb

Bust relationship cache key (#37760)

2026-02-06 14:36:12 +00:00

remotable.rb

…

reviewable.rb

…