Claire ef3d15554b Merge commit 'c645490d55' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.		2024-02-24 14:46:14 +01:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge commit 'c645490d55' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
helpers	Merge commit 'aaa58d4807' into glitch-soc/merge-upstream	2024-02-24 14:27:43 +01:00
javascript	Merge commit 'c645490d55' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
lib	Merge commit 'c645490d55' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +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 'c645490d55' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01: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 'aaa58d4807' into glitch-soc/merge-upstream	2024-02-24 14:27:43 +01:00
services	Fix link verifications when page size exceeds 1MB (#29358)	2024-02-22 20:45:40 +01:00
validators	Merge commit '01ce9df880' into glitch-soc/merge-upstream	2024-01-24 20:42:53 +01:00
views	Merge commit 'aaa58d4807' into glitch-soc/merge-upstream	2024-02-24 14:27:43 +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