fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-02 09:45:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/mix-task-logging

Browse source
This commit is contained in:
Mark Felder 2019-11-20 09:16:46 -06:00
parent 1c17f18329 937d6c6b32
commit 140a54fd4e
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.dockerignore
View file

@ -5,7 +5,6 @@ CC-BY-SA-4.0
COPYING COPYING
*file *file
elixir_buildpack.config elixir_buildpack.config
docs/
test/ test/
# Required to get version # Required to get version

2
test/web/mastodon_api/controllers/filter_controller_test.exs
View file

@ -3,7 +3,7 @@
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do defmodule Pleroma.Web.MastodonAPI.FilterControllerTest do
use Pleroma.Web.ConnCase, async: true use Pleroma.Web.ConnCase
alias Pleroma.Web.MastodonAPI.FilterView alias Pleroma.Web.MastodonAPI.FilterView

2
test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs
View file

@ -3,7 +3,7 @@
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ScheduledActivityControllerTest do defmodule Pleroma.Web.MastodonAPI.ScheduledActivityControllerTest do
use Pleroma.Web.ConnCase, async: true use Pleroma.Web.ConnCase
alias Pleroma.Repo alias Pleroma.Repo
alias Pleroma.ScheduledActivity alias Pleroma.ScheduledActivity