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	Add a test for Settings::Extend#settings (#5720)	2017-11-19 04:15:32 +01:00
delivery_failure_tracker_spec.rb	After 7 days of repeated delivery failures, give up on inbox (#5131)	2017-09-29 03:16:20 +02:00
extractor_spec.rb	Spec Extractor (#3540)	2017-06-04 14:57:02 +02:00
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	Spec HashObject (#3544)	2017-06-04 14:59:52 +02:00
language_detector_spec.rb	Fix filterable_languages method of SettingsHelper (#4966)	2017-09-16 14:59:41 +02:00
request_spec.rb	Validate HTTP response length while receiving (#6891)	2018-03-26 14:02:10 +02:00
status_filter_spec.rb	Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752)	2017-06-15 02:00:08 +02:00
status_finder_spec.rb	Raise an error for remote url in StatusFinder (#4776)	2017-09-02 17:42:47 +02:00
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	Fix randomly fail (regression from #3560) (#3580)	2017-06-05 10:03:36 +02:00