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

Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream

Browse source
This commit is contained in:
Ivan Tashkinov 2020-09-17 17:14:20 +03:00
commit d9fb5bc08a
52 changed files with 1315 additions and 465 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

@ -449,7 +449,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)