diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-01 16:18:16 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-01 16:18:16 +0300 |
| commit | 88f7cf51d43181b27db5ff1807d3e706fa336bac (patch) | |
| tree | 3c3f8ba3b7685290e26c3582eeba7ba55ca1d10b /test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs | |
| parent | 708fd234bdff5423ca6d8003232eca0df231bbc2 (diff) | |
| parent | 0d24ab04c5ea779432b4ea174a1d470dac87315d (diff) | |
| download | pleroma-88f7cf51d43181b27db5ff1807d3e706fa336bac.tar.gz pleroma-88f7cf51d43181b27db5ff1807d3e706fa336bac.zip | |
Merge branch 'develop' into issue/1411
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 |