David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00

..

activitypub

Use atomUri in Undo activity of Announce (#5376)

2017-10-14 14:42:09 +02:00

ostatus

Introduce OStatus::TagManager (#5008)

2017-09-19 18:08:08 +02:00

settings

Delegate some methods of User to @settings (#5706)

2017-11-15 16:05:20 +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 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00

formatter_spec.rb

Custom emoji (#4988)

2017-09-19 02:42:40 +02: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

HTTP signatures (#4146)

2017-07-14 20:41:49 +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

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

…