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 d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		4 years ago
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
v2	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
web	Refactor Api::Web::SettingsController (#15717)	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