diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-30 12:21:16 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-30 12:21:16 +0000 |
| commit | 905bb11747fb87f2ad960175e1fc73aa0e3657a0 (patch) | |
| tree | c92908b5d32c4f84f98807b655c726e0d5a88674 /test/web/mastodon_api/controllers/domain_block_controller_test.exs | |
| parent | 3f0e276ac94589d860c7e4c95d3661fa494f4361 (diff) | |
| parent | c55facf78b6714947d8c5b02b76846f5f2ae7744 (diff) | |
| download | pleroma-905bb11747fb87f2ad960175e1fc73aa0e3657a0.tar.gz pleroma-905bb11747fb87f2ad960175e1fc73aa0e3657a0.zip | |
Merge branch 'split-masto-api/accounts' into 'develop'
Extract account actions from `MastodonAPIController` to `AccountController`
See merge request pleroma/pleroma!1731
Diffstat (limited to 'test/web/mastodon_api/controllers/domain_block_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/domain_block_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/controllers/domain_block_controller_test.exs b/test/web/mastodon_api/controllers/domain_block_controller_test.exs index 3c3558385..25a279cdc 100644 --- a/test/web/mastodon_api/controllers/domain_block_controller_test.exs +++ b/test/web/mastodon_api/controllers/domain_block_controller_test.exs @@ -3,7 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.MastodonAPI.DomainBlockControllerTest do - use Pleroma.Web.ConnCase, async: true + use Pleroma.Web.ConnCase alias Pleroma.User |