mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-19 05:13:01 +00:00
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. |
||
|---|---|---|
| .. | ||
| account_actions | ||
| account_moderation_notes | ||
| account_warnings | ||
| accounts | ||
| action_logs | ||
| change_emails | ||
| custom_emojis | ||
| dashboard | ||
| domain_blocks | ||
| email_domain_blocks | ||
| followers | ||
| instances | ||
| invites | ||
| relays | ||
| report_notes | ||
| reports | ||
| settings | ||
| statuses | ||
| subscriptions | ||
| tags | ||
| warning_presets | ||