diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-05 12:22:19 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-05 12:22:19 +0300 |
| commit | 49bb0a130f93476d32d3177d7a989b7a98a063f2 (patch) | |
| tree | 6e64e2bbe2644dd607ec685de5b2bf94c1f9326c /test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs | |
| parent | b9041c209787dc279d4dc5194d65dff73684cdb9 (diff) | |
| parent | 228bf4d214abe3bb62c52128d3bc145e396b174d (diff) | |
| download | pleroma-49bb0a130f93476d32d3177d7a989b7a98a063f2.tar.gz pleroma-49bb0a130f93476d32d3177d7a989b7a98a063f2.zip | |
Merge branch 'develop' into issue/1276
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 |