mastodon/spec/lib
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/controllers/settings/preferences_controller.rb
 	app/lib/user_settings_decorator.rb
 	app/models/user.rb
 	config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
..
activitypub Resolve unknown status from Add activity, skip Remove if unknown (#7526) 2018-05-18 11:33:56 +02:00
ostatus Append '.test' to hostname in stub data (#7260) 2018-04-25 14:12:28 +02:00
settings
delivery_failure_tracker_spec.rb
extractor_spec.rb
feed_manager_spec.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-02-24 05:17:10 +00:00
formatter_spec.rb Append '.test' to hostname in stub data (#7260) 2018-04-25 14:12:28 +02:00
hash_object_spec.rb
language_detector_spec.rb
request_spec.rb Validate HTTP response length while receiving (#6891) 2018-03-26 14:02:10 +02:00
status_filter_spec.rb
status_finder_spec.rb
tag_manager_spec.rb Append '.test' to hostname in stub data (#7260) 2018-04-25 14:12:28 +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