hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Pinned Statuses

Closes #440

See merge request pleroma/pleroma!636
This commit is contained in:
kaniini 2019-01-10 02:39:53 +00:00
commit 7f5efddd6e
19 changed files with 370 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/web/twitter_api/views/activity_view_test.exs
View file

@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do
@ -136,6 +136,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do
"possibly_sensitive" => false,
"repeat_num" => 0,
"repeated" => false,
"pinned" => false,
"statusnet_conversation_id" => convo_id,
"summary" => "",
"summary_html" => "",