Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.		2022-11-12 13:28:03 +01:00
..
chewy
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
mailers
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
presenters	Change sign-in banner to reflect disabled or moved account status (#19773)	2022-11-05 18:28:13 +01:00
serializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-30 18:15:28 +01:00
views	Add back missing glitch-soc admin settings (#1919)	2022-11-12 13:24:53 +01:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00