You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		4 years ago
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
connection_pool	Add request pool to improve delivery performance (#10353)	5 years ago
ostatus	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
proof_provider/keybase	Fix Keybase verification using wrong domain for remote accounts (#10547)	6 years ago
rss	Improve RSS entries for statuses (#13592)	5 years ago
settings	Add a test for Settings::Extend#settings (#5720)	7 years ago
delivery_failure_tracker_spec.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	5 years ago
extractor_spec.rb	Spec Extractor (#3540)	8 years ago
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
formatter_spec.rb	Add support for magnet: URIs (#12905)	5 years ago
hash_object_spec.rb	Spec HashObject (#3544)	8 years ago
language_detector_spec.rb	Change language detection to include hashtags as words (#11341)	5 years ago
request_pool_spec.rb	Add request pool to improve delivery performance (#10353)	5 years ago
request_spec.rb	Fix connect timeout not being enforced (#9329)	6 years ago
sanitize_config_spec.rb	Add support for “start” and “reversed” attributes to ol element	4 years ago
spam_check_spec.rb	Remove auto-silence behaviour from spam check (#12117)	5 years ago
status_filter_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	6 years ago
status_finder_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
tag_manager_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
user_settings_decorator_spec.rb	Enable updating additional account information from user preferences via rest api (#6789)	7 years ago
webfinger_resource_spec.rb	Fix webfinger returning wrong status code on malformed or missing param (#13759)	5 years ago