aboutsummaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/domain_block_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-10-02 13:27:55 +0200
committerlain <lain@soykaf.club>2019-10-02 13:27:55 +0200
commit557223b2b5b60956d3e1a19e9fdae9e9798c4fe2 (patch)
tree71d711f8932a2bd952f9f54ccef1322c55aed1d7 /test/web/mastodon_api/controllers/domain_block_controller_test.exs
parent19bc0b8c79765dc485e081651a4e4c589d18b970 (diff)
parent433f2c0f6854d2838819e08f0fb0a9e8cf058021 (diff)
downloadpleroma-557223b2b5b60956d3e1a19e9fdae9e9798c4fe2.tar.gz
Merge remote-tracking branch 'origin/develop' into reactions
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.exs2
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