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

Merge branch 'develop' into issue/1342

Browse source
This commit is contained in:
Maksim Pechnikov 2019-12-08 21:25:26 +03:00
commit 95e6a2acd9
55 changed files with 1159 additions and 417 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/web/twitter_api/util_controller_test.exs
View file

@ -407,7 +407,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
user = insert(:user)
user2 = insert(:user)
{:ok, _user} = Pleroma.User.block(user2, user)
{:ok, _user_block} = Pleroma.User.block(user2, user)
response =
conn
@ -505,7 +505,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
Pleroma.Config.put([:user, :deny_follow_blocked], true)
user = insert(:user)
user2 = insert(:user)
{:ok, _user} = Pleroma.User.block(user2, user)
{:ok, _user_block} = Pleroma.User.block(user2, user)
response =
conn