David Yip f61aa8e0f7 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb		2018-03-27 10:26:47 -05:00
..
activitypub	Fix #6657 - Use target instead of origin in Remove activity (#6664)	2018-03-07 03:54:46 +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
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
language_detector_spec.rb	Fix filterable_languages method of SettingsHelper (#4966)	2017-09-16 14:59:41 +02:00
provider_discovery_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	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