Claire 4fbd1ad7ae Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream ...

Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.

2026-02-11 13:32:18 +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 '2774e0fbfa045e883ec94e873e657e9e8fefa98b' into glitch-soc/merge-upstream

2026-02-10 12:03:53 +01:00

auth

Update devise to version 5.0 (#37419)

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

concerns

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

2026-02-11 13:32:18 +01:00

disputes

Remove duplicate cache header setting before action (#33833)

2025-02-05 09:19:08 +00:00

filters

Remove duplicate cache header setting before action (#33833)

2025-02-05 09:19:08 +00:00

oauth

Refactor store_current_location before_action in OAuth::AuthorizationsController (#37779)

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

redirect

Move redirect/base body class to view (#31796)

2024-09-12 13:31:50 +00:00

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

Simplify instance presenter view access (#26046)

2023-09-28 16:52:37 +02:00

accounts_controller.rb

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

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

application_controller.rb

Move theme-related helper methods out of controller (#37807)

2026-02-10 15:34:42 +00:00

authorize_interactions_controller.rb

Merge commit from fork

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

backups_controller.rb

Change media attachments in moderated posts to not be accessible (#34872)

2025-06-12 08:53:02 +00:00

collections_controller.rb

Add collection endpoint (#37468)

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

custom_css_controller.rb

Extend custom CSS cache time with digest paths (#33207)

2025-01-08 08:48:45 +00:00

emojis_controller.rb

Refactor Cache-Control and Vary definitions (#24347)

2023-04-19 16:07:29 +02:00

filters_controller.rb

Remove duplicate cache header setting before action (#33833)

2025-02-05 09:19:08 +00:00

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

Disable Rails/ApplicationController for HealthController (#28705)

2024-01-12 09:08:17 +00:00

home_controller.rb

Simplify instance presenter view access (#26046)

2023-09-28 16:52:37 +02:00

instance_actors_controller.rb

Move common module inclusion in sub classes to ActivityPub::BaseController (#29560)

2024-03-15 10:40:21 +00:00

intents_controller.rb

Remove redundant return in IntentsController (#29099)

2024-02-06 12:56:22 +00:00

invites_controller.rb

Remove duplicate cache header setting before action (#33833)

2025-02-05 09:19:08 +00:00

mail_subscriptions_controller.rb

Fix contrast between background and form elements on some pages (#31266)

2024-08-02 13:55:31 +00:00

manifests_controller.rb

Fix some user-independent endpoints potentially reading session cookies (#24650)

2023-04-25 22:14:44 +02:00

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

Simplify instance presenter view access (#26046)

2023-09-28 16:52:37 +02:00

relationships_controller.rb

Remove duplicate cache header setting before action (#33833)

2025-02-05 09:19:08 +00:00

remote_interaction_helper_controller.rb

Change interaction modal in web UI (#26075)

2023-07-27 16:11:17 +02:00

severed_relationships_controller.rb

Merge commit from fork

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

shares_controller.rb

Move shares/modal body class to layout (#31789)

2024-09-06 16:46:55 +00:00

statuses_cleanup_controller.rb

Remove duplicate cache header setting before action (#33833)

2025-02-05 09:19:08 +00:00

statuses_controller.rb

Refactor activity serialization (#37678)

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

tags_controller.rb

Rename cache_* methods to preload_* in controller concern (#30209)

2024-05-16 08:03:46 +00:00

terms_of_service_controller.rb

Add interstitial for Terms of Service updates (#34527)

2025-05-16 14:03:05 +00:00

wrapstodon_controller.rb

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

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