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.

2021-07-11 21:41:23 +02:00

..

activitypub

Merge branch 'main' into glitch-soc/merge-upstream

2021-05-17 10:30:34 +02:00

nodeinfo

Add openRegistrations attribute to nodeinfo endpoint (#12058)

2019-10-02 21:02:48 +02:00

rest

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-11 21:41:23 +02:00

rss

Improve RSS entries for statuses (#13592)

2020-05-10 09:50:54 +02:00

web

Only display web push notifications after API call (fixes #7902) (#8396)

2018-08-23 21:44:27 +02:00

initial_state_serializer.rb

Merge branch 'main' into glitch-soc/merge-upstream

2021-06-30 00:42:52 +02:00

manifest_serializer.rb

Add app shortcuts (#15234)

2020-12-15 02:04:56 +01:00

oembed_serializer.rb

Improve RSS entries for statuses (#13592)

2020-05-10 09:50:54 +02:00

webfinger_serializer.rb

Remove XML version of Webfinger and remove links to Atom feeds (#11460)

2019-08-01 19:14:02 +02:00