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

Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"

Browse source 
This reverts merge request !1737
This commit is contained in:
kaniini 2019-10-05 10:00:05 +00:00
commit e07e9cb75e
11 changed files with 14 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
View file

@ -8,7 +8,6 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
alias Pleroma.Conversation.Participation
alias Pleroma.Notification
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web.CommonAPI
import Pleroma.Factory
@ -74,7 +73,6 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
participation = Repo.preload(participation, :recipients)
user = User.get_cached_by_id(user.id)
assert [user] == participation.recipients
assert other_user not in participation.recipients