mastodon/app
Claire 449dc30739 Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/content_security_policy.rb`:
  Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to
  glitch-soc's `EXTRA_DATA_HOST`.
  Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.
2025-03-26 19:14:26 +01:00
..
chewy
controllers Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream 2025-03-25 19:59:59 +01:00
helpers Merge commit '547658f086b2bfb396f69822d7ba938e4c0caf80' into glitch-soc/merge-upstream 2025-03-18 22:03:50 +01:00
inputs Add age verification on sign-up (#34150) 2025-03-14 14:07:29 +00:00
javascript Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream 2025-03-26 19:14:26 +01:00
lib Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream 2025-03-26 19:14:26 +01:00
mailers Add ability to email announcements to all users (#33928) 2025-03-06 14:05:27 +00:00
models Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream 2025-03-26 19:14:26 +01:00
policies Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream 2025-03-07 18:34:27 +01:00
presenters Remove unused LanguagePresenter#native_name (#33551) 2025-01-13 12:58:53 +00:00
serializers Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream 2025-03-26 19:14:26 +01:00
services Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream 2025-03-26 19:14:26 +01:00
validators Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream 2025-03-15 17:49:32 +01:00
views Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream 2025-03-26 18:18:07 +01:00
workers Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream 2025-03-12 19:48:51 +01:00