mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 16:35:48 +00:00
c1c514ca70
Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”. |
||
---|---|---|
.. | ||
activitypub | ||
concerns | ||
pubsubhubbub | ||
account_search_service.rb | ||
after_block_domain_from_account_service.rb | ||
after_block_service.rb | ||
authorize_follow_service.rb | ||
backup_service.rb | ||
base_service.rb | ||
batched_remove_status_service.rb | ||
block_domain_service.rb | ||
block_service.rb | ||
bootstrap_timeline_service.rb | ||
fan_out_on_write_service.rb | ||
favourite_service.rb | ||
fetch_atom_service.rb | ||
fetch_link_card_service.rb | ||
fetch_oembed_service.rb | ||
fetch_remote_account_service.rb | ||
fetch_remote_status_service.rb | ||
follow_service.rb | ||
mute_service.rb | ||
notify_service.rb | ||
post_status_service.rb | ||
precompute_feed_service.rb | ||
process_feed_service.rb | ||
process_hashtags_service.rb | ||
process_interaction_service.rb | ||
process_mentions_service.rb | ||
reblog_service.rb | ||
reject_follow_service.rb | ||
remove_status_service.rb | ||
report_service.rb | ||
resolve_account_service.rb | ||
resolve_url_service.rb | ||
search_service.rb | ||
send_interaction_service.rb | ||
subscribe_service.rb | ||
suspend_account_service.rb | ||
unblock_domain_service.rb | ||
unblock_service.rb | ||
unfavourite_service.rb | ||
unfollow_service.rb | ||
unmute_service.rb | ||
unsubscribe_service.rb | ||
update_account_service.rb | ||
update_remote_profile_service.rb | ||
verify_salmon_service.rb |