mastodon/app
Claire 7d52d5df0f Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict due to upstream adding fallback support for MathML Core while
  glitch-soc supported slightly more tags than upstream.
  Added the MathML Core fallback code to glitch-soc.
- `spec/lib/sanitize/config_spec.rb`:
  Ditto.
2024-12-01 18:22:00 +01:00
..
chewy
controllers Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream 2024-12-01 17:36:49 +01:00
helpers Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream 2024-12-01 17:36:49 +01:00
javascript Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream 2024-12-01 18:22:00 +01:00
lib Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream 2024-12-01 18:22:00 +01:00
mailers Add coverage for missing status scenario in NotificationMailer (#32256) 2024-10-04 14:15:14 +00:00
models Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream 2024-12-01 18:22:00 +01:00
policies
presenters Update dependency doorkeeper to v5.8.0 (#33000) 2024-11-21 13:48:30 +00:00
serializers Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream 2024-12-01 18:22:00 +01:00
services Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream 2024-12-01 17:36:49 +01:00
validators Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
views Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream 2024-12-01 18:22:00 +01:00
workers Merge commit 'd0753ec276502ea28a1e853cbc6487020a0602e3' into glitch-soc/merge-upstream 2024-11-24 18:56:15 +01:00