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

diff --git a/test/fixtures/share.xml b/test/fixtures/share.xml
deleted file mode 100644
index e07b88680..000000000
--- a/test/fixtures/share.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<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:poco="http://portablecontacts.net/spec/1.0" xmlns:media="http://purl.org/syndication/atommedia" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:mastodon="http://mastodon.social/schema/1.0">
-  <id>tag:mastodon.social,2017-05-03:objectId=4934452:objectType=Status</id>
-  <published>2017-05-03T08:21:09Z</published>
-  <updated>2017-05-03T08:21:09Z</updated>
-  <title>lambadalambda shared a status by lain@pleroma.soykaf.com</title>
-  <author>
-    <id>https://mastodon.social/users/lambadalambda</id>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-    <uri>https://mastodon.social/users/lambadalambda</uri>
-    <name>lambadalambda</name>
-    <email>lambadalambda@mastodon.social</email>
-    <link rel="alternate" type="text/html" href="https://mastodon.social/@lambadalambda"/>
-    <link rel="avatar" type="image/gif" media:width="120" media:height="120" href="https://files.mastodon.social/accounts/avatars/000/000/264/original/1429214160519.gif"/>
-    <link rel="header" type="" media:width="700" media:height="335" href="/headers/original/missing.png"/>
-    <poco:preferredUsername>lambadalambda</poco:preferredUsername>
-    <poco:displayName>Critical Value</poco:displayName>
-    <mastodon:scope>public</mastodon:scope>
-  </author>
-  <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
-  <activity:verb>http://activitystrea.ms/schema/1.0/share</activity:verb>
-  <activity:object>
-    <id>https://pleroma.soykaf.com/objects/4c1bda26-902e-4525-9fcd-b9fd44925193</id>
-    <published>2017-05-03T08:04:44Z</published>
-    <updated>2017-05-03T08:05:52Z</updated>
-    <title>New status by lain@pleroma.soykaf.com</title>
-    <author>
-      <id>https://pleroma.soykaf.com/users/lain</id>
-      <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-      <uri>https://pleroma.soykaf.com/users/lain</uri>
-      <name>lain</name>
-      <email>lain@pleroma.soykaf.com</email>
-      <summary type="html">Test account</summary>
-      <link rel="alternate" type="text/html" href="https://pleroma.soykaf.com/users/lain"/>
-      <link rel="avatar" type="image/jpeg" media:width="120" media:height="120" href="https://files.mastodon.social/accounts/avatars/000/125/902/original/6B3AFC74ACA841B24CFB94DB9044C84EDE6AFF31C71718B023D413DAED09A68E.jpeg"/>
-      <link rel="header" type="" media:width="700" media:height="335" href="/headers/original/missing.png"/>
-      <poco:preferredUsername>lain</poco:preferredUsername>
-      <poco:displayName>Lain Iwakura</poco:displayName>
-      <poco:note>Test account</poco:note>
-      <mastodon:scope>public</mastodon:scope>
-    </author>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
-    <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-    <content type="html" xml:lang="en">Added returning the entries as xml... let's see if the mastodon hammering stops now.</content>
-    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
-    <mastodon:scope>public</mastodon:scope>
-    <link rel="alternate" type="text/html" href=""/>
-  </activity:object>
-  <content type="html" xml:lang="en">Added returning the entries as xml... let's see if the mastodon hammering stops now.</content>
-  <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
-  <mastodon:scope>public</mastodon:scope>
-  <link rel="alternate" type="text/html" href="https://mastodon.social/users/lambadalambda/updates/2232660"/>
-  <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/lambadalambda/updates/2232660.atom"/>
-</entry>