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 f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		5 years ago
..
activitypub	Add test ensuring that unknown object types are rejected (#10166)	5 years ago
ostatus	rubocop issues - Cleaning up (#8912)	6 years ago
settings	…
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)	5 years ago
hash_object_spec.rb	…
language_detector_spec.rb	Leave unknown language as nil if account is remote (#8861)	6 years ago
request_spec.rb	Fix connect timeout not being enforced (#9329)	6 years ago
status_filter_spec.rb	…
status_finder_spec.rb	Add tests for embeds controller (#7719)	6 years ago
tag_manager_spec.rb	Append '.test' to hostname in stub data (#7260)	6 years ago
user_settings_decorator_spec.rb	Enable updating additional account information from user preferences via rest api (#6789)	6 years ago
webfinger_resource_spec.rb	…