This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/serializers
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
2018-05-03 17:23:44 -05:00
..
activitypub Add bio fields (#6645) 2018-04-14 12:41:08 +02:00
rest Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
rss Add RSS feeds for end-users (#7259) 2018-04-25 02:10:02 +02:00
web Fix WebPush (regression from #4524) (#4778) 2017-09-02 16:50:42 +02:00
initial_state_serializer.rb retrieve custom emoji list via API instead of before page load (#7047) 2018-04-04 22:25:34 +02:00
manifest_serializer.rb implement web share target (#6278) 2018-01-17 17:08:10 +01:00
oembed_serializer.rb Clean up and improve generated OpenGraph tags (#4901) 2017-09-12 05:39:38 +02:00
webfinger_serializer.rb Remove rabl dependency (#5894) 2017-12-06 15:04:49 +09:00