mastodon/app/serializers
Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design.
2019-08-30 13:38:41 +02:00
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
rss Add an RSS feed tagged to a public profile page (#10502) 2019-08-18 20:54:36 +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 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
manifest_serializer.rb Improve config serializer for Keybase (#10338) 2019-03-21 23:33:28 +01:00
oembed_serializer.rb Add allowfullscreen attribute to oembed iframe (#10370) 2019-03-25 15:01:09 +01:00
webfinger_serializer.rb Remove XML version of Webfinger and remove links to Atom feeds (#11460) 2019-08-01 19:14:02 +02:00