Claire 73f77c49d8 Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
  Bumped the Mastodon API version as upstream did.

2026-03-16 18:16:56 +01:00

..

account

Use to_json call for raw event strings (#38215)

2026-03-16 13:55:58 +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 'a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2' into glitch-soc/merge-upstream

2026-01-03 15:26:58 +01:00

attachmentable.rb

Update rubocop to version 1.76.0 (#34926)

2025-06-05 12:09:05 +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

canonical_email.rb

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

2025-08-07 13:47:47 +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

Simplify DatabaseViewRecord.refresh (#35252)

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

domain_materializable.rb

…

domain_normalizable.rb

Use consistent calling style for TagManager#normalize_domain (#35764)

2026-02-27 16:38:34 +00:00

expireable.rb

Fix Rails/WhereRange cop (#30343)

2024-05-20 09:37:36 +00:00

follow_limitable.rb

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

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

inet_container.rb

Add InetContainer with scopes of containing and contained (#32802)

2024-11-08 10:08:36 +00:00

lockable.rb

…

paginable.rb

…

ranked_trend.rb

Add coverage for StatusTrend and PreviewCardTrend models, add locales class method to RankedTrend (#32688)

2024-10-29 15:46:32 +00:00

rate_limitable.rb

Use attribute for defining rate_limit boolean (#35555)

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

redisable.rb

Refactor (ruby) redis configuration (#31694)

2024-09-02 14:19:55 +00:00

relationship_cacheable.rb

Bust relationship cache key (#37760)

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

remotable.rb

Add OpenSSL::SSL::SSLError to http connection errors wrapper (#32307)

2024-10-08 14:59:51 +00:00

reviewable.rb

Add reviewed and unreviewed scopes to Reviewable model concern (#31988)

2024-09-20 08:51:37 +00:00