You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		2 years ago
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
v2	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
web	Refactor formatter (#17828)	3 years ago
base_controller.rb	Change `AUTHORIZED_FETCH` to not block unauthenticated REST API access (#19803)	2 years ago
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	5 years ago