Claire 487c814eb9 Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Glitch-soc allows a wider range of HTML than upstream.
  Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
  added it there too.

2026-05-22 19:43:42 +02:00

..

activitypub

Merge commit '664efcf4c3f9713894054fb642a252d8752a4123' into glitch-soc/merge-upstream

2026-03-25 21:09:30 +01:00

admin

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

2026-05-18 19:35:08 +02:00

api

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

2026-05-22 19:43:42 +02:00

auth

Extract security_key_options endpoint to standalone controller (#38367)

2026-03-25 10:35:09 +00:00

concerns

Merge commit '02deb0b2381e116b512a826064f6d4008c260cd5' into glitch-soc/merge-upstream

2026-04-13 19:12:08 +02:00

disputes

…

email_subscriptions

Add email subscriptions (#38163)

2026-03-25 16:25:45 +00:00

filters

…

oauth

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

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

redirect

Redirect with interstitial when trying to view a remote collection while logged out (#38941)

2026-05-07 16:04:26 +00:00

settings

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

2026-04-17 18:06:10 +02:00

well_known

Fix Webfinger endpoint not handling new AP ID scheme (#38391)

2026-03-26 09:58:47 +00:00

about_controller.rb

…

accounts_controller.rb

Merge commit '3d8d5f6dc7625d9638cc2e3387247442225d4e3f' into glitch-soc/merge-upstream

2026-03-05 18:21:07 +01:00

application_controller.rb

Extract ErrorResponses from application controller (#38105)

2026-03-09 11:30:41 +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

Use /collections/:id as canonical URL for a collection (#38783)

2026-04-23 07:36:35 +00:00

custom_css_controller.rb

Use mime type symbol to set content_type for custom css response (#37845)

2026-05-19 07:16:24 +00:00

emojis_controller.rb

…

filters_controller.rb

…

follower_accounts_controller.rb

…

following_accounts_controller.rb

…

health_controller.rb

…

home_controller.rb

…

instance_actors_controller.rb

…

intents_controller.rb

…

invites_controller.rb

…

manifests_controller.rb

…

media_controller.rb

Simplify media attachment lookup in show/player actions (#38565)

2026-04-07 09:58:37 +00: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

Add private method for event export filename (#38454)

2026-03-27 15:25:19 +00:00

shares_controller.rb

…

statuses_cleanup_controller.rb

…

statuses_controller.rb

Redirect to short account URLs when requesting HTML for one of the AP endpoints (#38056)

2026-03-04 17:44:27 +00:00

tags_controller.rb

…

terms_of_service_controller.rb

…

unsubscriptions_controller.rb

Add email subscriptions (#38163)

2026-03-25 16:25:45 +00:00

wrapstodon_controller.rb

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

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