Claire 0e1ea3110e Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
  line adding a glitch API version.

2026-02-27 21:25:37 +01:00

..

activitypub

Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream

2026-02-27 21:25:37 +01:00

admin

Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream

2026-02-27 21:25:37 +01:00

api

Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream

2026-02-27 21:25:37 +01:00

auth

Update devise to version 5.0 (#37419)

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

concerns

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

2026-02-11 20:26:56 +01:00

disputes

…

filters

…

oauth

Add ability to require 2FA for specific roles (including Everybody) (#37701)

2026-02-11 14:34:09 +00:00

redirect

…

settings

[Fix undefined current_flavour in controllers (/settings/flavours page) (#3400)

2026-02-16 09:20:51 +01:00

well_known

…

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

Add ability to require 2FA for specific roles (including Everybody) (#37701)

2026-02-11 14:34:09 +00:00

authorize_interactions_controller.rb

Merge commit from fork

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

backups_controller.rb

…

collection_items_controller.rb

Add ID/URI to collection items (#37842)

2026-02-12 15:31:45 +00:00

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