mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-11 07:55:04 +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. |
||
|---|---|---|
| .. | ||
| access_token_fabricator.rb | ||
| accessible_access_token_fabricator.rb | ||
| account_domain_block_fabricator.rb | ||
| account_fabricator.rb | ||
| account_moderation_note_fabricator.rb | ||
| account_pin_fabricator.rb | ||
| account_stat_fabricator.rb | ||
| account_tag_stat_fabricator.rb | ||
| account_warning_fabricator.rb | ||
| account_warning_preset_fabricator.rb | ||
| admin_action_log_fabricator.rb | ||
| application_fabricator.rb | ||
| backup_fabricator.rb | ||
| block_fabricator.rb | ||
| bookmark_fabricator.rb | ||
| conversation_account_fabricator.rb | ||
| conversation_fabricator.rb | ||
| conversation_mute_fabricator.rb | ||
| custom_emoji_fabricator.rb | ||
| custom_filter_fabricator.rb | ||
| domain_block_fabricator.rb | ||
| email_domain_block_fabricator.rb | ||
| favourite_fabricator.rb | ||
| follow_fabricator.rb | ||
| follow_request_fabricator.rb | ||
| identity_fabricator.rb | ||
| import_fabricator.rb | ||
| invite_fabricator.rb | ||
| list_account_fabricator.rb | ||
| list_fabricator.rb | ||
| media_attachment_fabricator.rb | ||
| mention_fabricator.rb | ||
| mute_fabricator.rb | ||
| notification_fabricator.rb | ||
| relay_fabricator.rb | ||
| report_fabricator.rb | ||
| report_note_fabricator.rb | ||
| scheduled_status_fabricator.rb | ||
| session_activation_fabricator.rb | ||
| setting_fabricator.rb | ||
| site_upload_fabricator.rb | ||
| status_fabricator.rb | ||
| status_pin_fabricator.rb | ||
| status_stat_fabricator.rb | ||
| stream_entry_fabricator.rb | ||
| subscription_fabricator.rb | ||
| tag_fabricator.rb | ||
| user_fabricator.rb | ||
| web_push_subscription_fabricator.rb | ||
| web_setting_fabricator.rb | ||