Claire 040b7d37a4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict due to glitch-soc having extra code for a proper direct visibility timeline, in a part of the code upstream refactored. Restored glitch-soc's extra code in the refactored bit.		2022-05-16 09:42:32 +02:00
..
chewy	Let votes statuses are also searchable (#18070)	2022-04-23 21:47:27 +02:00
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 09:42:32 +02:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +02:00
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 09:42:32 +02:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 09:42:32 +02:00
mailers	Fix failure when sending warning emails with custom text (#17983)	2022-04-07 14:47:30 +02:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 09:42:32 +02:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-06 21:10:23 +02:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
serializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +02:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 09:42:32 +02:00
validators	Allow import/export of instance-level domain blocks/allows (#1754)	2022-05-16 09:29:01 +02:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 09:42:32 +02:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 09:42:32 +02:00