Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 57 deletions

diff --git a/test/fixtures/ostatus_incoming_post.xml b/test/fixtures/ostatus_incoming_post.xml
deleted file mode 100644
index 7967e1b32..000000000
--- a/test/fixtures/ostatus_incoming_post.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
- <generator uri="https://gnu.io/social" version="1.0.2-dev">GNU social</generator>
- <id>https://social.heldscal.la/api/statuses/user_timeline/23211.atom</id>
- <title>lambadalambda timeline</title>
- <subtitle>Updates from lambadalambda on social.heldscal.la!</subtitle>
- <logo>https://social.heldscal.la/avatar/23211-96-20170416114255.jpeg</logo>
- <updated>2017-04-29T18:25:38+00:00</updated>
-<author>
- <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
- <uri>https://social.heldscal.la/user/23211</uri>
- <name>lambadalambda</name>
- <summary>Call me Deacon Blues.</summary>
- <link rel="alternate" type="text/html" href="https://social.heldscal.la/lambadalambda"/>
- <link rel="avatar" type="image/jpeg" media:width="236" media:height="236" href="https://social.heldscal.la/avatar/23211-original-20170416114255.jpeg"/>
- <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="https://social.heldscal.la/avatar/23211-96-20170416114255.jpeg"/>
- <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="https://social.heldscal.la/avatar/23211-48-20170416114255.jpeg"/>
- <link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="https://social.heldscal.la/avatar/23211-24-20170416114257.jpeg"/>
- <poco:preferredUsername>lambadalambda</poco:preferredUsername>
- <poco:displayName>Constance Variable</poco:displayName>
- <poco:note>Call me Deacon Blues.</poco:note>
- <poco:address>
-  <poco:formatted>Berlin</poco:formatted>
- </poco:address>
- <poco:urls>
-  <poco:type>homepage</poco:type>
-  <poco:value>https://heldscal.la</poco:value>
-  <poco:primary>true</poco:primary>
- </poco:urls>
- <followers url="https://social.heldscal.la/lambadalambda/subscribers"></followers>
- <statusnet:profile_info local_id="23211"></statusnet:profile_info>
-</author>
- <link href="https://social.heldscal.la/lambadalambda" rel="alternate" type="text/html"/>
- <link href="https://social.heldscal.la/main/sup" rel="http://api.friendfeed.com/2008/03#sup" type="application/json"/>
- <link href="https://social.heldscal.la/main/push/hub" rel="hub"/>
- <link href="https://social.heldscal.la/main/salmon/user/23211" rel="salmon"/>
- <link href="https://social.heldscal.la/main/salmon/user/23211" rel="http://salmon-protocol.org/ns/salmon-replies"/>
- <link href="https://social.heldscal.la/main/salmon/user/23211" rel="http://salmon-protocol.org/ns/salmon-mention"/>
- <link href="https://social.heldscal.la/api/statuses/user_timeline/23211.atom" rel="self" type="application/atom+xml"/>
-<entry>
- <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
- <id>tag:social.heldscal.la,2017-04-29:noticeId=1967725:objectType=note</id>
- <title>New note by lambadalambda</title>
- <content type="html">Will it blend?</content>
- <link rel="alternate" type="text/html" href="https://social.heldscal.la/notice/1967725"/>
- <status_net notice_id="1967725"></status_net>
- <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
- <published>2017-04-29T18:25:38+00:00</published>
- <updated>2017-04-29T18:25:38+00:00</updated>
- <link rel="ostatus:conversation" href="https://social.heldscal.la/conversation/1007861"/>
- <ostatus:conversation href="https://social.heldscal.la/conversation/1007861" local_id="1007861" ref="tag:social.heldscal.la,2017-04-29:objectType=thread:nonce=3f3a9dd83acc4e35">tag:social.heldscal.la,2017-04-29:objectType=thread:nonce=3f3a9dd83acc4e35</ostatus:conversation>
- <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
- <link rel="self" type="application/atom+xml" href="https://social.heldscal.la/api/statuses/show/1967725.atom"/>
- <link rel="edit" type="application/atom+xml" href="https://social.heldscal.la/api/statuses/show/1967725.atom"/>
- <statusnet:notice_info local_id="1967725" source="Pleroma FE"></statusnet:notice_info>
-</entry>
-</feed>