mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-23 17:44:24 +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. |
||
|---|---|---|
| .. | ||
| accounts | ||
| apps | ||
| instances | ||
| lists | ||
| push | ||
| statuses | ||
| timelines | ||
| accounts_controller_spec.rb | ||
| apps_controller_spec.rb | ||
| blocks_controller_spec.rb | ||
| bookmarks_controller_spec.rb | ||
| conversations_controller_spec.rb | ||
| custom_emojis_controller_spec.rb | ||
| domain_blocks_controller_spec.rb | ||
| endorsements_controller_spec.rb | ||
| favourites_controller_spec.rb | ||
| filter_controller_spec.rb | ||
| follow_requests_controller_spec.rb | ||
| follows_controller_spec.rb | ||
| instances_controller_spec.rb | ||
| lists_controller_spec.rb | ||
| media_controller_spec.rb | ||
| mutes_controller_spec.rb | ||
| notifications_controller_spec.rb | ||
| reports_controller_spec.rb | ||
| search_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| streaming_controller_spec.rb | ||
| suggestions_controller_spec.rb | ||