fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-27 02:54:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/serializers
History
Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
2020-12-15 14:27:06 +01:00
..
activitypub Fix media not being marked sensitive when outgoing CW is set 2020-11-13 01:05:55 +01:00
nodeinfo Add openRegistrations attribute to nodeinfo endpoint (#12058) 2019-10-02 21:02:48 +02:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2020-12-09 14:42:33 +01:00
rss Improve RSS entries for statuses (#13592) 2020-05-10 09:50:54 +02:00
web
initial_state_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +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