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 f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.		4 years ago
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
v2	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
web	Fix not being able to enable status notifications in Web Push API (#14822)	4 years ago
base_controller.rb	Fix 2FA/sign-in token sessions being valid after password change (#14802)	4 years ago
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	5 years ago
proofs_controller.rb	Fix proofs API being inaccessible in secure mode (#12495)	5 years ago