mastodon/app
Claire bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
..
chewy Change account search to match by text when opted-in (#25599) 2023-06-29 13:05:21 +02:00
controllers Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
helpers Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 2023-07-30 13:15:01 +02:00
javascript Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
lib Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
mailers Refactor `NotificationMailer` to use parameterization (#25718) 2023-07-10 03:06:22 +02:00
models Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
policies Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
presenters Wrong count in response when removing favourite/reblog (#24365) 2023-07-19 09:02:30 +02:00
serializers Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
services Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 2023-07-30 13:15:01 +02:00
validators Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
views Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
workers Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream 2023-07-30 13:42:06 +02:00