Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... 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.		2020-08-30 16:13:08 +02:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-30 16:13:08 +02:00
connection_pool
ostatus
proof_provider/keybase
rss	Improve RSS entries for statuses (#13592)	2020-05-10 09:50:54 +02:00
settings
delivery_failure_tracker_spec.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	2020-04-15 20:33:24 +02:00
extractor_spec.rb
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-22 13:38:17 +02:00
formatter_spec.rb	Add support for magnet: URIs (#12905)	2020-01-23 21:27:26 +01:00
hash_object_spec.rb
language_detector_spec.rb
request_pool_spec.rb
request_spec.rb
sanitize_config_spec.rb	Add support for “start” and “reversed” attributes to ol element	2020-07-01 01:02:27 +02:00
spam_check_spec.rb
status_filter_spec.rb
status_finder_spec.rb
tag_manager_spec.rb
user_settings_decorator_spec.rb
webfinger_resource_spec.rb	Fix webfinger returning wrong status code on malformed or missing param (#13759)	2020-05-14 23:28:06 +02:00