diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-11-20 09:16:46 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-11-20 09:16:46 -0600 |
| commit | 140a54fd4e5c085c2e7f4078155610e20e20edbc (patch) | |
| tree | 854552593d2a5c949826d3086e034f4a1880536a | |
| parent | 1c17f1832983a784156118d1cd488bfde88f092b (diff) | |
| parent | 937d6c6b32fc735cb5a56d9a3d97a6b2e8f37f68 (diff) | |
| download | pleroma-140a54fd4e5c085c2e7f4078155610e20e20edbc.tar.gz pleroma-140a54fd4e5c085c2e7f4078155610e20e20edbc.zip | |
Merge branch 'develop' into fix/mix-task-logging
| -rw-r--r-- | .dockerignore | 1 | ||||
| -rw-r--r-- | test/web/mastodon_api/controllers/filter_controller_test.exs | 2 | ||||
| -rw-r--r-- | test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/.dockerignore b/.dockerignore index c5ef89b86..6b1879e62 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,7 +5,6 @@ CC-BY-SA-4.0 COPYING *file elixir_buildpack.config -docs/ test/ # Required to get version diff --git a/test/web/mastodon_api/controllers/filter_controller_test.exs b/test/web/mastodon_api/controllers/filter_controller_test.exs index 5d5b56c8e..550689788 100644 --- a/test/web/mastodon_api/controllers/filter_controller_test.exs +++ b/test/web/mastodon_api/controllers/filter_controller_test.exs @@ -3,7 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do - use Pleroma.Web.ConnCase, async: true + use Pleroma.Web.ConnCase alias Pleroma.Web.MastodonAPI.FilterView 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 |