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 e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		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	Add stoplight for object storage failures, return HTTP 503 (#13043)	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