Claire a482932649 Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change.		2024-02-27 19:20:57 +01:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream	2024-02-27 19:20:57 +01:00
helpers	Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream	2024-02-24 14:27:43 +01:00
javascript	Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream	2024-02-27 19:20:57 +01:00
lib	Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream	2024-02-27 19:20:57 +01:00
mailers	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-22 20:45:40 +01:00
models	Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream	2024-02-26 17:43:16 +01: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 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream	2024-02-24 14:27:43 +01:00
services	Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream	2024-02-24 15:35:56 +01:00
validators	Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream	2024-01-24 20:42:53 +01:00
views	Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream	2024-02-26 17:43:16 +01:00
workers	Fix auto-close email being sent to users with devops permissions instead of settings permissions (#29355)	2024-02-22 20:45:40 +01:00