Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code.		2024-11-03 20:51:58 +01:00
..
activitypub	Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream	2024-11-03 20:51:58 +01:00
admin	Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream	2024-11-03 20:51:58 +01:00
api	Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream	2024-11-03 20:51:58 +01:00
auth	Move non-action public method controller callback to private methods (#31933)	2024-09-18 08:05:25 +00:00
concerns	Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream	2024-10-26 13:38:07 +02:00
disputes	Set "admin" body class from `admin` nested layout (#31269)	2024-09-06 13:58:46 +00:00
filters	Set "admin" body class from `admin` nested layout (#31269)	2024-09-06 13:58:46 +00:00
oauth	Add userinfo oauth endpoint (#32548)	2024-10-30 14:38:10 +00:00
redirect	Move redirect/base body class to view (#31796)	2024-09-12 13:31:50 +00:00
settings	Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream	2024-10-06 16:07:58 +02:00
well_known	Support /.well-known/host-meta.json (#32206)	2024-10-02 09:23:44 +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 '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream	2024-10-14 19:46:52 +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	Set "admin" body class from `admin` nested layout (#31269)	2024-09-06 13:58:46 +00: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	Set "admin" body class from `admin` nested layout (#31269)	2024-09-06 13:58:46 +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	…
media_controller.rb	Add coverage for `media#player`, move body class to view (#31790)	2024-09-06 16:46:25 +00:00
media_proxy_controller.rb	Add `OpenSSL::SSL::SSLError` to http connection errors wrapper (#32307)	2024-10-08 14:59:51 +00:00
privacy_controller.rb	…
relationships_controller.rb	Set "admin" body class from `admin` nested layout (#31269)	2024-09-06 13:58:46 +00:00
remote_interaction_helper_controller.rb	…
severed_relationships_controller.rb	Set "admin" body class from `admin` nested layout (#31269)	2024-09-06 13:58:46 +00:00
shares_controller.rb	Move shares/modal body class to layout (#31789)	2024-09-06 16:46:55 +00:00
statuses_cleanup_controller.rb	Set "admin" body class from `admin` nested layout (#31269)	2024-09-06 13:58:46 +00:00
statuses_controller.rb	Remove unused `statuses#embed` body class assignment (#31787)	2024-09-12 13:38:15 +00:00
tags_controller.rb	Rename `cache_*` methods to `preload_*` in controller concern (#30209)	2024-05-16 08:03:46 +00:00