Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		2019-01-10 21:00:30 +01:00
..
v2
account_serializer.rb	Add a per-user setting to hide followers count	2018-12-20 14:51:12 +01:00
application_serializer.rb
context_serializer.rb
conversation_serializer.rb	Add unread indicator to conversations (#9009)	2018-10-19 01:47:29 +02:00
credential_account_serializer.rb
custom_emoji_serializer.rb
filter_serializer.rb	Fix filter ID not being a string in REST API (#9303)	2018-11-19 10:37:57 +01:00
instance_serializer.rb
list_serializer.rb	Add backend support to read and update list-specific show_replies settings	2018-11-28 14:46:07 +01:00
media_attachment_serializer.rb
mute_serializer.rb
notification_serializer.rb
preview_card_serializer.rb
relationship_serializer.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	2018-08-09 09:56:53 +02:00
report_serializer.rb
scheduled_status_serializer.rb	Fix wrong param name in scheduled statuses and return params in API (#9725)	2019-01-06 12:03:27 +01:00
search_serializer.rb
status_serializer.rb	Add field to serialized local-only statuses	2018-11-13 18:55:57 +01:00
tag_serializer.rb
web_push_subscription_serializer.rb