Claire dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 ... Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper.		2024-10-05 20:45:05 +02:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge branch 'stable-4.3' into glitch-soc/backports-4.3	2024-10-05 20:45:05 +02:00
helpers	Merge branch 'stable-4.3' into glitch-soc/backports-4.3	2024-10-05 20:45:05 +02:00
javascript	Merge branch 'stable-4.3' into glitch-soc/backports-4.3	2024-10-05 20:45:05 +02:00
lib	Merge branch 'stable-4.3' into glitch-soc/backports-4.3	2024-10-05 20:45:05 +02:00
mailers	Add coverage and use mailer callback to check functional user in notification mailer (#32055)	2024-09-25 08:07:48 +00:00
models	Merge branch 'stable-4.3' into glitch-soc/backports-4.3	2024-10-05 20:45:05 +02:00
policies	Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream	2024-05-20 12:17:36 +02:00
presenters	Add preview of followers removed in domain block modal in web UI (#32032)	2024-09-25 18:13:36 +00:00
serializers	Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream	2024-09-29 11:06:09 +02:00
services	Merge branch 'stable-4.3' into glitch-soc/backports-4.3	2024-10-05 20:45:05 +02:00
validators	Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream	2024-09-21 15:06:06 +02:00
views	Merge branch 'stable-4.3' into glitch-soc/backports-4.3	2024-10-05 20:45:05 +02:00
workers	Merge branch 'stable-4.3' into glitch-soc/backports-4.3	2024-10-05 20:45:05 +02:00