From: kaniini <nenolod@gmail.com>
Date: Thu, 10 Jan 2019 02:39:53 +0000 (+0000)
Subject: Merge branch 'feature/pinned-posts' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7f5efddd6ed60fead5b456186b67a96dde95e6b9;p=akkoma

Merge branch 'feature/pinned-posts' into 'develop'

Pinned Statuses

Closes #440

See merge request pleroma/pleroma!636
---

7f5efddd6ed60fead5b456186b67a96dde95e6b9
diff --cc test/web/twitter_api/views/activity_view_test.exs
index 5294204c6,374440300..8b5a16add
--- a/test/web/twitter_api/views/activity_view_test.exs
+++ b/test/web/twitter_api/views/activity_view_test.exs
@@@ -136,9 -132,9 +136,10 @@@ defmodule Pleroma.Web.TwitterAPI.Activi
        "possibly_sensitive" => false,
        "repeat_num" => 0,
        "repeated" => false,
+       "pinned" => false,
        "statusnet_conversation_id" => convo_id,
        "summary" => "",
 +      "summary_html" => "",
        "statusnet_html" =>
          "Hey <span><a data-user=\"#{other_user.id}\" href=\"#{other_user.ap_id}\">@<span>shp</span></a></span>!",
        "tags" => [],