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 cdf20f4367 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/rest/instance_serializer.rb`: Upstream changed the fields returned by /api/v1/instance by adding a `configuration` field holding a lot of useful information making our `max_toot_chars` and `poll_limits` fields obsolete. Keeping those around for now for compatibility. - `app/validators/status_length_validator.rb`: No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to MAX_CHARS which is defined differently in glitch-soc. Ported upstream changes.		3 years ago
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
nodeinfo	Add `openRegistrations` attribute to nodeinfo endpoint (#12058)	5 years ago
rest	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
rss	Improve RSS entries for statuses (#13592)	5 years ago
web	…
initial_state_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
manifest_serializer.rb	Add app shortcuts (#15234)	4 years ago
oembed_serializer.rb	Improve RSS entries for statuses (#13592)	5 years ago
webfinger_serializer.rb	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	5 years ago