Claire 81d24609e5 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
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
v2	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
web	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
base_controller.rb	Change AUTHORIZED_FETCH to not block unauthenticated REST API access (#19803)	2022-11-05 22:56:03 +01:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00