Merge branch 'develop' into gun

This commit is contained in:
Alexander Strizhakov 2020-03-18 14:08:21 +03:00
commit f9ecb513fa
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
11 changed files with 43 additions and 35 deletions

View file

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