Claire 11dd51ef44 Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream and glitch-soc had different comments, some comments got updated upstream. Updated them in glitch-soc accordingly.		2024-07-06 21:02:42 +02:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream	2024-07-04 17:12:14 +02:00
helpers	Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream	2024-06-22 20:59:23 +02:00
javascript	Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream	2024-07-06 21:02:42 +02:00
lib	Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream	2024-07-06 21:02:42 +02:00
mailers	Remove duplicate method def `ApplicationHelper#instance_presenter` (#30331)	2024-05-17 08:29:13 +00:00
models	Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream	2024-06-30 11:25:40 +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 '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream	2024-06-30 11:25:40 +02:00
services	Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream	2024-07-06 21:02:42 +02:00
validators	Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
views	Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream	2024-06-30 11:25:40 +02:00
workers	Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream	2024-05-29 17:03:24 +02:00