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 c118918520 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes.		2 years ago
..
v1	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
v2	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
web	Refactor formatter (#17828)	3 years ago
base_controller.rb	Change `AUTHORIZED_FETCH` to not block unauthenticated REST API access (#19803)	2 years ago
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	5 years ago