Thibaut Girka 9748f074a3 Merge branch 'master' into glitch-soc/merge-upstream ... 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.		2020-09-08 16:26:47 +02:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-07 09:21:38 +02:00
connection_pool	…
nodeinfo	…
ostatus	…
proof_provider	…
rss	…
settings	…
activity_tracker.rb	…
application_extension.rb	…
delivery_failure_tracker.rb	…
entity_cache.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	2020-09-01 03:04:00 +02:00
exceptions.rb	…
extractor.rb	…
fast_geometry_parser.rb	…
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-08 16:26:47 +02:00
formatter.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-01 17:02:18 +02:00
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	…
potential_friendship_tracker.rb	…
proof_provider.rb	…
rate_limiter.rb	…
request.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	2020-09-01 03:04:00 +02:00
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	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	2020-09-01 03:04:00 +02:00
spam_check.rb	…
status_filter.rb	…
status_finder.rb	…
tag_manager.rb	…
themes.rb	…
toc_generator.rb	…
user_settings_decorator.rb	…
webfinger_resource.rb	…