Claire 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block.		2023-07-12 15:27:32 +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 '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-06 15:16:34 +02:00
javascript	Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00
lib	Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00
mailers	Add unsubscribe link to e-mails (#25378)	2023-06-12 14:22:46 +02:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-07 19:59:43 +02:00
policies	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
presenters	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
serializers	Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00
services	Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00
validators	Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream	2023-05-25 23:47:28 +02:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2023-06-27 13:15:41 +02:00
workers	Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00