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, 44 deletions

diff --git a/test/fixtures/tesla_mock/7369654.atom b/test/fixtures/tesla_mock/7369654.atom
deleted file mode 100644
index 74fd9ce6b..000000000
--- a/test/fixtures/tesla_mock/7369654.atom
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:georss="http://www.georss.org/georss" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:media="http://purl.org/syndication/atommedia" xmlns:statusnet="http://status.net/schema/api/1/">
- <activity:object-type>http://activitystrea.ms/schema/1.0/comment</activity:object-type>
- <id>tag:shitposter.club,2018-02-22:noticeId=7369654:objectType=comment</id>
- <title>New comment by shpuld</title>
- <content type="html">@&lt;a href=&quot;https://testing.pleroma.lol/users/lain&quot; class=&quot;h-card mention&quot; title=&quot;Rael Electric Razor&quot;&gt;lain&lt;/a&gt; me far right</content>
- <link rel="alternate" type="text/html" href="https://shitposter.club/notice/7369654"/>
- <status_net notice_id="7369654"></status_net>
- <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
- <published>2018-02-22T09:20:12+00:00</published>
- <updated>2018-02-22T09:20:12+00:00</updated>
- <author>
-  <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-  <uri>https://shitposter.club/user/5381</uri>
-  <name>shpuld</name>
-  <link rel="alternate" type="text/html" href="https://shitposter.club/shpuld"/>
-  <link rel="avatar" type="image/png" media:width="864" media:height="864" href="https://shitposter.club/avatar/5381-original-20171230093854.png"/>
-  <link rel="avatar" type="image/png" media:width="96" media:height="96" href="https://shitposter.club/avatar/5381-96-20171230093854.png"/>
-  <link rel="avatar" type="image/png" media:width="48" media:height="48" href="https://shitposter.club/avatar/5381-48-20171230093854.png"/>
-  <link rel="avatar" type="image/png" media:width="24" media:height="24" href="https://shitposter.club/avatar/5381-24-20171230093900.png"/>
-  <poco:preferredUsername>shpuld</poco:preferredUsername>
-  <poco:displayName>shp</poco:displayName>
-  <followers url="https://shitposter.club/shpuld/subscribers"></followers>
-  <statusnet:profile_info local_id="5381"></statusnet:profile_info>
- </author>
- <thr:in-reply-to ref="https://testing.pleroma.lol/objects/b319022a-4946-44c5-9de9-34801f95507b" href="https://testing.pleroma.lol/objects/b319022a-4946-44c5-9de9-34801f95507b"></thr:in-reply-to>
- <link rel="related" href="https://testing.pleroma.lol/objects/b319022a-4946-44c5-9de9-34801f95507b"/>
- <link rel="ostatus:conversation" href="https://shitposter.club/conversation/4378601"/>
- <ostatus:conversation href="https://shitposter.club/conversation/4378601" local_id="4378601" ref="tag:shitposter.club,2018-02-22:objectType=thread:nonce=e5a7c72d60a9c0e4">tag:shitposter.club,2018-02-22:objectType=thread:nonce=e5a7c72d60a9c0e4</ostatus:conversation>
- <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="https://testing.pleroma.lol/users/lain"/>
- <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
- <source>
-  <id>https://shitposter.club/api/statuses/user_timeline/5381.atom</id>
-  <title>shp</title>
-  <link rel="alternate" type="text/html" href="https://shitposter.club/shpuld"/>
-  <link rel="self" type="application/atom+xml" href="https://shitposter.club/api/statuses/user_timeline/5381.atom"/>
-  <link rel="license" href="https://shitposter.club/doc/tos"/>
-  <icon>https://shitposter.club/avatar/5381-96-20171230093854.png</icon>
-  <updated>2018-02-23T13:30:15+00:00</updated>
- </source>
- <link rel="self" type="application/atom+xml" href="https://shitposter.club/api/statuses/show/7369654.atom"/>
- <link rel="edit" type="application/atom+xml" href="https://shitposter.club/api/statuses/show/7369654.atom"/>
- <statusnet:notice_info local_id="7369654" source="Pleroma FE"></statusnet:notice_info>
-</entry>