9748f074a3
Conflicts: - app/controllers/api/v1/timelines/public_controller.rb - app/lib/feed_manager.rb - app/models/status.rb - app/services/precompute_feed_service.rb - app/workers/feed_insert_worker.rb - spec/models/status_spec.rb All conflicts are due to upstream refactoring feed management and us having local-only toots on top of that. Rewrote local-only toots management for upstream's changes. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| connection_pool | ||
| ostatus | ||
| proof_provider/keybase | ||
| rss | ||
| settings | ||
| delivery_failure_tracker_spec.rb | ||
| extractor_spec.rb | ||
| feed_manager_spec.rb | ||
| formatter_spec.rb | ||
| hash_object_spec.rb | ||
| language_detector_spec.rb | ||
| request_pool_spec.rb | ||
| request_spec.rb | ||
| sanitize_config_spec.rb | ||
| spam_check_spec.rb | ||
| status_filter_spec.rb | ||
| status_finder_spec.rb | ||
| tag_manager_spec.rb | ||
| user_settings_decorator_spec.rb | ||
| webfinger_resource_spec.rb | ||