Claire 59e02a628d Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream ...

Conflicts:
- `app/services/backup_service.rb`:
  Upstream refactored activity serialization while glitch-soc passed an extra argument.
  Followed upstream's refactor, keeping our extra argument.

2026-02-05 12:43:12 +01:00

..

activitypub

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

2026-02-03 15:44:04 +01:00

admin

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

2025-12-04 20:16:21 +01:00

api

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

2026-02-05 12:43:12 +01:00

auth

Update devise to version 5.0 (#37419)

2026-02-05 11:05:32 +00:00

concerns

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

2026-01-28 19:29:10 +01:00

disputes

…

filters

…

oauth

Reduce oauth/authorizations monkey-patch size (#37615)

2026-01-28 09:29:59 +00:00

redirect

…

settings

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

2025-09-10 18:11:12 +02:00

well_known

Update OAuth inflection to match spec (#35160)

2025-06-25 07:52:30 +00:00

about_controller.rb

…

accounts_controller.rb

Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream

2025-09-29 18:41:46 +02:00

application_controller.rb

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

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

authorize_interactions_controller.rb

Merge commit from fork

2025-12-08 15:44:08 +01:00

backups_controller.rb

…

collections_controller.rb

Add collection endpoint (#37468)

2026-01-14 10:08:29 +00:00

custom_css_controller.rb

…

emojis_controller.rb

…

filters_controller.rb

…

follower_accounts_controller.rb

Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream

2025-10-31 18:03:21 +01:00

following_accounts_controller.rb

Use before_action to protect hidden collections in following/followers lists (#35783)

2025-10-30 16:34:19 +00:00

health_controller.rb

…

home_controller.rb

…

instance_actors_controller.rb

…

intents_controller.rb

…

invites_controller.rb

…

mail_subscriptions_controller.rb

…

manifests_controller.rb

…

media_controller.rb

Merge commit from fork

2025-12-08 15:44:08 +01:00

media_proxy_controller.rb

Group classes in media proxy rescue_from declaration (#37304)

2026-01-28 10:52:31 +00:00

privacy_controller.rb

…

relationships_controller.rb

…

remote_interaction_helper_controller.rb

…

severed_relationships_controller.rb

Merge commit from fork

2026-01-07 14:15:14 +01:00

shares_controller.rb

…

statuses_cleanup_controller.rb

…

statuses_controller.rb

Refactor activity serialization (#37678)

2026-02-05 09:39:27 +00:00

tags_controller.rb

…

terms_of_service_controller.rb

…

wrapstodon_controller.rb

Increase cache duration on public shared wrapstodon page (#37249)

2025-12-15 10:19:17 +00:00