Claire 0f90e624c5 Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Conflict due to our theming system being different. Ported upstream's changes.		2024-05-01 16:10:45 +02:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream	2024-05-01 14:25:47 +02:00
helpers	Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream	2024-05-01 16:10:45 +02:00
javascript	Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream	2024-05-01 16:10:45 +02:00
lib	Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream	2024-05-01 16:10:45 +02:00
mailers	Use existing MascotHelper#instance_presenter instead of local var in welcome email template (#29759)	2024-03-26 15:58:48 +00:00
models	Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream	2024-05-01 14:50:16 +02:00
policies	Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream	2024-01-26 20:47:20 +01:00
presenters	Add annual reports for accounts (#28693)	2024-01-24 09:38:10 +00:00
serializers	Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream	2024-05-01 14:50:16 +02:00
services	Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream	2024-05-01 14:31:14 +02:00
validators	Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream	2024-01-24 20:42:53 +01:00
views	Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream	2024-05-01 16:10:45 +02:00
workers	Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream	2024-03-11 17:29:07 +01:00