mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-12 08:25:19 +00:00
249991c498
Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
concerns | ||
import | ||
maintenance | ||
pubsubhubbub | ||
scheduler | ||
web | ||
after_account_domain_block_worker.rb | ||
after_remote_follow_request_worker.rb | ||
after_remote_follow_worker.rb | ||
authorize_follow_worker.rb | ||
backup_worker.rb | ||
block_worker.rb | ||
bootstrap_timeline_worker.rb | ||
digest_mailer_worker.rb | ||
distribution_worker.rb | ||
domain_block_worker.rb | ||
feed_insert_worker.rb | ||
fetch_reply_worker.rb | ||
import_worker.rb | ||
link_crawl_worker.rb | ||
local_notification_worker.rb | ||
merge_worker.rb | ||
mute_worker.rb | ||
notification_worker.rb | ||
poll_expiration_notify_worker.rb | ||
processing_worker.rb | ||
publish_scheduled_status_worker.rb | ||
push_conversation_worker.rb | ||
push_update_worker.rb | ||
refollow_worker.rb | ||
regeneration_worker.rb | ||
remote_profile_update_worker.rb | ||
removal_worker.rb | ||
resolve_account_worker.rb | ||
salmon_worker.rb | ||
thread_resolve_worker.rb | ||
unfavourite_worker.rb | ||
unfollow_follow_worker.rb | ||
unmerge_worker.rb | ||
verify_account_links_worker.rb |