Claire fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream ...

Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.

2025-01-27 18:19:09 +01:00

..

activitypub

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

2025-01-14 20:38:32 +01:00

admin

Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream

2025-01-27 18:19:09 +01:00

api

Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream

2025-01-23 13:38:23 +01:00

auth

Use expect params wrapper for more "auth" and "2FA" "controllers" (#33717)

2025-01-24 14:40:20 +00:00

concerns

Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream

2025-01-27 18:19:09 +01:00

disputes

Use expect for nested params in more controllers (#33675)

2025-01-22 08:35:34 +00:00

filters

Use expect in remaining controller locations (#33748)

2025-01-27 16:32:06 +00:00

oauth

Fix logic in "last used at per application" oauth token list (#32912)

2024-11-15 15:52:37 +00:00

redirect

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

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

settings

Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream

2025-01-27 18:19:09 +01: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 '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream

2024-12-25 18:01:37 +01:00

authorize_interactions_controller.rb

…

backups_controller.rb

…

custom_css_controller.rb

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

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

emojis_controller.rb

…

filters_controller.rb

Fix issue with saving empty fields values on filter keyword updates (#33691)

2025-01-23 09:04:12 +00:00

follower_accounts_controller.rb

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

2025-01-14 20:38:32 +01:00

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

…

invites_controller.rb

Use expect for nested params in more controllers (#33675)

2025-01-22 08:35:34 +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

Use expect in remaining controller locations (#33748)

2025-01-27 16:32:06 +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

Use expect for nested params in more controllers (#33675)

2025-01-22 08:35:34 +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

terms_of_service_controller.rb

Add terms of service (#33055)

2024-12-09 10:04:46 +00:00