Claire e590177b29 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.		2020-12-15 14:27:06 +01:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +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	Add stoplight for object storage failures, return HTTP 503 (#13043)	2020-12-15 12:55:29 +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