David Yip 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		2018-03-02 21:46:44 -06:00
..
activitypub	Federated reports (#6570)	2018-02-28 06:54:55 +01:00
ostatus	Introduce OStatus::TagManager (#5008)	2017-09-19 18:08:08 +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	Don't normalize URLs in toots (#6134)	2018-01-03 20:51:33 +01: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
provider_discovery_spec.rb	A minor change for ProviderDiscovery and spec (#3543)	2017-06-04 14:59:40 +02:00
request_spec.rb	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)	2018-02-24 19:16:11 +01: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	Introduce OStatus::TagManager (#5008)	2017-09-19 18:08:08 +02:00
user_settings_decorator_spec.rb	Remove empty strings (#5732)	2017-11-17 10:52:30 +09:00
webfinger_resource_spec.rb	Fix randomly fail (regression from #3560) (#3580)	2017-06-05 10:03:36 +02:00