Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.

2024-05-16 19:30:10 +02:00

..

activitypub

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

2024-05-16 19:30:10 +02:00

admin

Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream

2024-05-06 17:53:51 +02:00

api

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

2024-05-16 19:30:10 +02:00

auth

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

concerns

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

2024-05-16 19:30:10 +02:00

disputes

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

filters

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

oauth

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

redirect

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

settings

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

2024-05-16 19:30:10 +02:00

well_known

Implement RFC 8414 for OAuth 2.0 server metadata (#29191)

2024-05-06 13:17:56 +00:00

about_controller.rb

…

accounts_controller.rb

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

2024-05-16 19:30:10 +02:00

application_controller.rb

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

2024-05-16 19:30:10 +02:00

authorize_interactions_controller.rb

…

backups_controller.rb

…

custom_css_controller.rb

Add scope providing_styles to UserRole (#29286)

2024-02-20 09:18:05 +00:00

emojis_controller.rb

…

filters_controller.rb

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

follower_accounts_controller.rb

…

following_accounts_controller.rb

…

health_controller.rb

Disable Rails/ApplicationController for HealthController (#28705)

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

home_controller.rb

…

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

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

mail_subscriptions_controller.rb

…

manifests_controller.rb

…

media_controller.rb

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

media_proxy_controller.rb

…

privacy_controller.rb

…

relationships_controller.rb

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

remote_interaction_helper_controller.rb

…

severed_relationships_controller.rb

Use existing SeveredRelationship.about_local_account scope in more places (#29673)

2024-03-21 08:36:49 +00:00

shares_controller.rb

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

statuses_cleanup_controller.rb

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

statuses_controller.rb

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

tags_controller.rb

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

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