diff options
| author | lain <lain@soykaf.club> | 2019-12-04 16:35:59 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-12-04 16:35:59 +0100 |
| commit | e9993acdbbd1649bbcbf3fb36581b91145fe6055 (patch) | |
| tree | b78d91c904e307a504ed91a06ab718d8c694ca5c /test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs | |
| parent | 1bd1f62af55e01613e6362661b36a19091c87424 (diff) | |
| parent | 228bf4d214abe3bb62c52128d3bc145e396b174d (diff) | |
| download | pleroma-e9993acdbbd1649bbcbf3fb36581b91145fe6055.tar.gz pleroma-e9993acdbbd1649bbcbf3fb36581b91145fe6055.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
Diffstat (limited to 'test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs b/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs index 9ad6a4fa7..ae5fee2bc 100644 --- a/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs +++ b/test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs @@ -3,7 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.MastodonAPI.ScheduledActivityControllerTest do - use Pleroma.Web.ConnCase, async: true + use Pleroma.Web.ConnCase alias Pleroma.Repo alias Pleroma.ScheduledActivity |