mastodon/app
Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
2023-07-17 19:02:23 +02:00
..
chewy Change account search to match by text when opted-in (#25599) 2023-06-29 13:05:21 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 12:52:15 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
mailers Refactor NotificationMailer to use parameterization (#25718) 2023-07-10 03:06:22 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 12:52:15 +02:00
policies Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
presenters
serializers Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream 2023-07-13 14:02:28 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
validators Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00