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	Add request pool to improve delivery performance (#10353)	2019-07-02 00:34:38 +02:00
ostatus	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
proof_provider/keybase	Fix Keybase verification using wrong domain for remote accounts (#10547)	2019-04-10 20:28:43 +02:00
rss	Improve RSS entries for statuses (#13592)	2020-05-10 09:50:54 +02:00
settings	Add a test for Settings::Extend#settings (#5720)	2017-11-19 04:15:32 +01:00
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	Spec Extractor (#3540)	2017-06-04 14:57:02 +02:00
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	Spec HashObject (#3544)	2017-06-04 14:59:52 +02:00
language_detector_spec.rb	Change language detection to include hashtags as words (#11341)	2019-07-18 03:02:15 +02:00
request_pool_spec.rb	Add request pool to improve delivery performance (#10353)	2019-07-02 00:34:38 +02:00
request_spec.rb	Fix connect timeout not being enforced (#9329)	2018-11-22 20:12:04 +01:00
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	Remove auto-silence behaviour from spam check (#12117)	2019-10-09 07:11:23 +02:00
status_filter_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
status_finder_spec.rb	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
tag_manager_spec.rb	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
user_settings_decorator_spec.rb	Enable updating additional account information from user preferences via rest api (#6789)	2018-04-08 13:43:10 +02:00
webfinger_resource_spec.rb	Fix webfinger returning wrong status code on malformed or missing param (#13759)	2020-05-14 23:28:06 +02:00