Claire 8089fa6935 Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Conflict because of glitch-soc's different theming system. Ported upstream's change.		2024-06-17 18:14:14 +02:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream	2024-06-11 19:46:11 +02:00
helpers	Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream	2024-06-17 18:14:14 +02:00
javascript	Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream	2024-06-17 18:14:14 +02:00
lib	Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream	2024-06-17 13:41:58 +02:00
mailers	Remove duplicate method def ApplicationHelper#instance_presenter (#30331)	2024-05-17 08:29:13 +00:00
models	Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream	2024-06-17 13:41:58 +02:00
policies	Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream	2024-05-20 12:17:36 +02:00
presenters	Fix repetitive database queries from #30040 (#30259)	2024-05-15 09:38:16 +00:00
serializers	Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream	2024-06-17 13:41:58 +02:00
services	Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream	2024-06-17 13:41:58 +02:00
validators	Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
views	Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream	2024-06-17 18:14:14 +02:00
workers	Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream	2024-05-29 17:03:24 +02:00