Claire 29124990a2 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.

2024-09-06 19:25:31 +02:00

..

activitypub

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

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

admin

Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream

2024-09-06 19:25:31 +02:00

api

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

2024-09-04 19:38:52 +02:00

auth

Set "admin" body class from admin nested layout (#31269)

2024-09-06 13:58:46 +00:00

concerns

Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream

2024-09-06 19:25:31 +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

Set "admin" body class from admin nested layout (#31269)

2024-09-06 13:58:46 +00:00

redirect

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

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

settings

Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream

2024-09-06 19:25:31 +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 '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream

2024-07-25 17:47:02 +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

…

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

…

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

Add have_http_link_header matcher and set header values as strings (#31010)

2024-09-05 20:05:38 +00:00

tags_controller.rb

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

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