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-09-14 13:50:30 +02:00
connection_pool
ostatus
rss
settings
delivery_failure_tracker_spec.rb
entity_cache_spec.rb
extractor_spec.rb
fast_ip_map_spec.rb
feed_manager_spec.rb
formatter_spec.rb
hash_object_spec.rb
language_detector_spec.rb
link_details_extractor_spec.rb	Add support for structured data and more OpenGraph tags to link cards (#16938)	2021-11-05 23:23:05 +01:00
permalink_redirector_spec.rb	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
request_pool_spec.rb
request_spec.rb
sanitize_config_spec.rb
status_filter_spec.rb
status_finder_spec.rb
tag_manager_spec.rb
user_settings_decorator_spec.rb
webfinger_resource_spec.rb