8c3c27bf06
Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes. |
||
---|---|---|
.. | ||
activitypub | ||
connection_pool | ||
nodeinfo | ||
ostatus | ||
proof_provider | ||
rss | ||
settings | ||
activity_tracker.rb | ||
application_extension.rb | ||
delivery_failure_tracker.rb | ||
entity_cache.rb | ||
exceptions.rb | ||
extractor.rb | ||
fast_geometry_parser.rb | ||
feed_manager.rb | ||
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 | ||
tag_manager.rb | ||
themes.rb | ||
toc_generator.rb | ||
user_settings_decorator.rb | ||
webfinger_resource.rb |