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

…

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

Don't normalize URLs in toots (#6134)

2018-01-03 20:51:33 +01:00

hash_object_spec.rb

…

language_detector_spec.rb

…

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

…

tag_manager_spec.rb

…

user_settings_decorator_spec.rb

…

webfinger_resource_spec.rb

…