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

Merge branch 'develop' into feature/expire-mutes

Browse source
This commit is contained in:
Roman Chvanikov 2020-09-17 14:54:00 +03:00
commit 44e8b6037a
48 changed files with 753 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/web/mastodon_api/views/account_view_test.exs
View file

@ -448,7 +448,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
test "shows unread_count only to the account owner" do
user = insert(:user)
insert_list(7, :notification, user: user)
insert_list(7, :notification, user: user, activity: insert(:note_activity))
other_user = insert(:user)
user = User.get_cached_by_ap_id(user.ap_id)