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 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		6 years ago
..
activitypub	Do not misattribute inlined boosts if `attributedTo` isn't present (#10967)	6 years ago
ostatus	rubocop issues - Cleaning up (#8912)	6 years ago
proof_provider/keybase	Fix Keybase verification using wrong domain for remote accounts (#10547)	6 years ago
settings	Add a test for Settings::Extend#settings (#5720)	7 years ago
delivery_failure_tracker_spec.rb	…
extractor_spec.rb	…
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
formatter_spec.rb	Fix URL linkifier grabbing full-width spaces and quotations (#9997)	6 years ago
hash_object_spec.rb	…
language_detector_spec.rb	Fix language detection of non-latin alphabets even at few characters (#10276)	6 years ago
request_spec.rb	Fix connect timeout not being enforced (#9329)	6 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	Add tests for embeds controller (#7719)	7 years ago
tag_manager_spec.rb	Append '.test' to hostname in stub data (#7260)	7 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	…