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

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2

Browse source
This commit is contained in:
lain 2020-03-20 14:52:58 +01:00
commit 1aa8aa7d7f
13 changed files with 129 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,7 +120,7 @@ defmodule Pleroma.Web.MastodonAPI.NotificationViewTest do
old_user = refresh_record(old_user)
new_user = refresh_record(new_user)
[notification] = Notification.for_user(follower, %{with_move: true})
[notification] = Notification.for_user(follower)
expected = %{
id: to_string(notification.id),