mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 21:03:27 +00:00
74c5b2bd08
Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| concerns | ||
| import | ||
| 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 | ||
| redownload_media_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 | ||