Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.		2021-11-26 22:53:55 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
admin	…
connection_pool	…
nodeinfo	…
ostatus	…
rss	…
settings	…
access_token_extension.rb	…
account_reach_finder.rb	…
activity_tracker.rb	…
application_extension.rb	…
cache_buster.rb	…
delivery_failure_tracker.rb	…
entity_cache.rb	…
extractor.rb	…
fast_geometry_parser.rb	…
fast_ip_map.rb	…
feed_manager.rb	…
formatter.rb	…
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	…
link_details_extractor.rb	…
permalink_redirector.rb	…
potential_friendship_tracker.rb	…
rate_limiter.rb	…
request.rb	…
request_pool.rb	…
response_with_limit.rb	…
rss_builder.rb	…
search_query_parser.rb	…
search_query_transformer.rb	…
sidekiq_error_handler.rb	…
status_filter.rb	…
status_finder.rb	…
status_reach_finder.rb	…
tag_manager.rb	…
themes.rb	…
toc_generator.rb	…
user_settings_decorator.rb	…
validation_error_formatter.rb	…
video_metadata_extractor.rb	…
webfinger.rb	…
webfinger_resource.rb	…