Claire bceb45adda Merge commit '3f6887557b' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/entrypoints/common.js`: Upstream moved everything from `app/javascript/packs` to `app/javascript/entrypoints` while this file was a glitch-soc addition. Moved it like the rest. - `tsconfig.json`: Conflict due to glitch-soc's flavor. Updated like upstream. Also moved and updated the following files accordingly: - `app/javascript/flavours/vanilla/theme.yml` - `app/javascript/flavours/glitch/theme.yml` - everything in `app/javascript/flavours/glitch/packs`		2024-05-04 14:59:00 +02:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge commit 'a2399046ca' into glitch-soc/merge-upstream	2024-05-01 19:49:59 +02:00
helpers	Merge commit '3f6887557b' into glitch-soc/merge-upstream	2024-05-04 14:59:00 +02:00
javascript	Merge commit '3f6887557b' into glitch-soc/merge-upstream	2024-05-04 14:59:00 +02:00
lib	Merge commit 'a2399046ca' into glitch-soc/merge-upstream	2024-05-01 19:49:59 +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 'ec71c02c4b' into glitch-soc/merge-upstream	2024-05-01 19:38:34 +02:00
policies	Merge commit '3205a654ca' 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 'a390299744' into glitch-soc/merge-upstream	2024-05-01 19:30:41 +02:00
services	Merge commit 'd27eb181f6' into glitch-soc/merge-upstream	2024-05-01 17:22:02 +02:00
validators	Merge commit '52ab8a59c6' into glitch-soc/merge-upstream	2024-05-01 17:30:52 +02:00
views	Merge commit '3f6887557b' into glitch-soc/merge-upstream	2024-05-04 14:59:00 +02:00
workers	Merge commit 'd27eb181f6' into glitch-soc/merge-upstream	2024-05-01 17:22:02 +02:00