Claire 54b6b035a7 Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes.		2023-07-12 15:38:35 +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 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' 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 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream	2023-07-12 15:38:35 +02:00
lib	Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00
mailers	Admin mailer parameterization (#25759)	2023-07-08 20:03:38 +02:00
models	Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream	2023-07-12 15:38:35 +02:00
policies	Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' 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 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00
services	Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream	2023-07-12 15:38:35 +02:00
validators	Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' 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 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00