mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-01-05 20:17:27 +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. |
||
---|---|---|
.. | ||
admin | ||
concerns | ||
form | ||
web | ||
account.rb | ||
account_conversation.rb | ||
account_domain_block.rb | ||
account_filter.rb | ||
account_moderation_note.rb | ||
account_pin.rb | ||
account_stat.rb | ||
account_tag_stat.rb | ||
account_warning.rb | ||
account_warning_preset.rb | ||
admin.rb | ||
application_record.rb | ||
backup.rb | ||
block.rb | ||
bookmark.rb | ||
context.rb | ||
conversation.rb | ||
conversation_mute.rb | ||
custom_emoji.rb | ||
custom_emoji_filter.rb | ||
custom_filter.rb | ||
domain_block.rb | ||
email_domain_block.rb | ||
export.rb | ||
favourite.rb | ||
feed.rb | ||
follow.rb | ||
follow_request.rb | ||
home_feed.rb | ||
identity.rb | ||
import.rb | ||
instance.rb | ||
instance_filter.rb | ||
invite.rb | ||
invite_filter.rb | ||
list.rb | ||
list_account.rb | ||
list_feed.rb | ||
media_attachment.rb | ||
mention.rb | ||
mute.rb | ||
notification.rb | ||
preview_card.rb | ||
relay.rb | ||
remote_follow.rb | ||
remote_profile.rb | ||
report.rb | ||
report_filter.rb | ||
report_note.rb | ||
scheduled_status.rb | ||
search.rb | ||
session_activation.rb | ||
setting.rb | ||
site_upload.rb | ||
status.rb | ||
status_pin.rb | ||
status_stat.rb | ||
stream_entry.rb | ||
subscription.rb | ||
tag.rb | ||
trending_tags.rb | ||
user.rb | ||
web.rb |