Claire 97ff0f94bf Merge commit 'a8109e50fc313b8124a3e471d41b490df59a68b8' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a field that was moved to another page due to glitch-soc's theming system.
  Ignored this one change.

2025-12-18 18:10:30 +01:00

..

action_dispatch

…

active_record

…

assets

…

chewy

Fix tootctl search deploy --only-mapping not updating index settings (#34566)

2025-04-28 13:02:41 +00:00

devise/strategies

…

elasticsearch

…

generators/post_deployment_migration

…

linter

…

mastodon

Make tootctl aware of 'require approval' for email domains (#34579)

2025-11-27 15:52:59 +00:00

paperclip

Update rubocop to version 1.80.2 (#36007)

2025-09-04 08:14:01 +00:00

rails

…

sanitize_ext

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

2025-05-25 15:11:58 +02:00

simple_navigation

…

tasks

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

2025-12-18 18:10:30 +01:00

templates/haml/scaffold

…

terrapin

…

vite_ruby

Fix cross-origin handling of CSS modules (#36890)

2025-11-14 15:42:26 +00:00

exceptions.rb

Fix synchronous recursive fetching of deeply-nested quoted posts (#35600)

2025-07-30 14:39:30 +00:00

premailer_bundled_asset_strategy.rb

Fix premailer strategy when using CDN_HOST (#34813)

2025-05-26 13:19:19 +00:00