diff options
| author | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-12-10 16:54:25 +0000 |
|---|---|---|
| committer | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-12-10 16:54:25 +0000 |
| commit | 8cfaab8f04cae6fcc20a37cdb463ee0c93b71217 (patch) | |
| tree | 5ea3e43a73796f264508b583051f6f2143071f00 /test/web/mastodon_api/controllers/timeline_controller_test.exs | |
| parent | 5abee19b63aa1577f8895b48ae69f0a51edb4dc3 (diff) | |
| parent | aac0187ec13078d2756db1671e644d6eb9c0947b (diff) | |
| download | pleroma-8cfaab8f04cae6fcc20a37cdb463ee0c93b71217.tar.gz pleroma-8cfaab8f04cae6fcc20a37cdb463ee0c93b71217.zip | |
Merge branch 'develop' into 'domain-block-precedence'
# Conflicts:
# lib/pleroma/user.ex
Diffstat (limited to 'test/web/mastodon_api/controllers/timeline_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/timeline_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/controllers/timeline_controller_test.exs b/test/web/mastodon_api/controllers/timeline_controller_test.exs index 61b6cea75..dc17cc963 100644 --- a/test/web/mastodon_api/controllers/timeline_controller_test.exs +++ b/test/web/mastodon_api/controllers/timeline_controller_test.exs @@ -194,7 +194,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do blocker = insert(:user) blocked = insert(:user) user = insert(:user) - {:ok, blocker} = User.block(blocker, blocked) + {:ok, _user_relationship} = User.block(blocker, blocked) {:ok, _blocked_direct} = CommonAPI.post(blocked, %{ |