Claire 537afa00f3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/feed_manager.rb`: Not a real conflict, glitch-soc-only DM-related method too close to changed upstream stuff. Ported upstream changes. - `app/services/batched_remove_status_service.rb`: Additional logic in glitch-soc to clear DMs from timelines. Ported upstream changes and fixed the DM TL clearing logic. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Additional code in glitch-soc to clear DM timelines. Ported upstream changes.		2020-12-23 01:47:45 +01:00
..
activitypub
connection_pool
nodeinfo
ostatus
proof_provider
rss
settings
access_token_extension.rb
activity_tracker.rb
application_extension.rb
cache_buster.rb
delivery_failure_tracker.rb
entity_cache.rb
exceptions.rb
extractor.rb
fast_geometry_parser.rb
fast_ip_map.rb
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-23 01:47:45 +01:00
formatter.rb
hash_object.rb
inline_renderer.rb
language_detector.rb
potential_friendship_tracker.rb
proof_provider.rb
rate_limiter.rb
request.rb
request_pool.rb
response_with_limit.rb
rss_builder.rb
sanitize_config.rb
search_query_parser.rb
search_query_transformer.rb
sidekiq_error_handler.rb
spam_check.rb
status_filter.rb
status_finder.rb
status_reach_finder.rb
tag_manager.rb
themes.rb
toc_generator.rb
user_settings_decorator.rb
webfinger.rb
webfinger_resource.rb