mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-22 14:53:15 +00:00
d392020da6
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit. |
||
---|---|---|
.. | ||
admin | ||
concerns | ||
form | ||
glitch | ||
web | ||
account_domain_block_spec.rb | ||
account_filter_spec.rb | ||
account_moderation_note_spec.rb | ||
account_spec.rb | ||
backup_spec.rb | ||
block_spec.rb | ||
conversation_mute_spec.rb | ||
conversation_spec.rb | ||
custom_emoji_spec.rb | ||
custom_filter_spec.rb | ||
domain_block_spec.rb | ||
email_domain_block_spec.rb | ||
export_spec.rb | ||
favourite_spec.rb | ||
follow_request_spec.rb | ||
follow_spec.rb | ||
home_feed_spec.rb | ||
identity_spec.rb | ||
import_spec.rb | ||
invite_spec.rb | ||
list_account_spec.rb | ||
list_spec.rb | ||
media_attachment_spec.rb | ||
mention_spec.rb | ||
mute_spec.rb | ||
notification_spec.rb | ||
preview_card_spec.rb | ||
remote_follow_spec.rb | ||
remote_profile_spec.rb | ||
report_filter_spec.rb | ||
report_spec.rb | ||
session_activation_spec.rb | ||
setting_spec.rb | ||
site_upload_spec.rb | ||
status_pin_spec.rb | ||
status_spec.rb | ||
stream_entry_spec.rb | ||
subscription_spec.rb | ||
tag_spec.rb | ||
user_spec.rb |