This repository has been archived on 2023-07-01. You can view files and clone it, but cannot push or open issues or pull requests.

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.		2020-12-05 17:33:37 +01:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-05 17:33:37 +01:00
v2	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
web	Fix not being able to enable status notifications in Web Push API (#14822)	2020-09-21 17:48:55 +02:00
base_controller.rb	Fix 2FA/sign-in token sessions being valid after password change (#14802)	2020-11-12 23:05:01 +01:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00
proofs_controller.rb	Fix proofs API being inaccessible in secure mode (#12495)	2019-11-28 04:07:49 +01:00