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 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		3 years ago
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
v2	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
web	Refactor Api::Web::SettingsController (#15717)	3 years ago
base_controller.rb	Add stoplight for object storage failures, return HTTP 503 (#13043)	3 years ago
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	4 years ago
proofs_controller.rb	Fix proofs API being inaccessible in secure mode (#12495)	5 years ago