mirror of https://github.com/Siphonay/mastodon
a2a64ecd3e
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. |
||
|---|---|---|
| .. | ||
| v2 | ||
| account_serializer.rb | ||
| application_serializer.rb | ||
| context_serializer.rb | ||
| conversation_serializer.rb | ||
| credential_account_serializer.rb | ||
| custom_emoji_serializer.rb | ||
| filter_serializer.rb | ||
| instance_serializer.rb | ||
| list_serializer.rb | ||
| media_attachment_serializer.rb | ||
| mute_serializer.rb | ||
| notification_serializer.rb | ||
| preview_card_serializer.rb | ||
| relationship_serializer.rb | ||
| report_serializer.rb | ||
| scheduled_status_serializer.rb | ||
| search_serializer.rb | ||
| status_serializer.rb | ||
| tag_serializer.rb | ||
| web_push_subscription_serializer.rb | ||