diff options
| author | Wim Vanderbauwhede <wim.vanderbauwhede@mail.be> | 2019-02-14 16:41:40 +0000 |
|---|---|---|
| committer | Wim Vanderbauwhede <wim.vanderbauwhede@mail.be> | 2019-02-14 16:41:40 +0000 |
| commit | 04b1c135543965860029557fc216eb38fd63b6c7 (patch) | |
| tree | c1fb60376eeb35539704c23d282af7777895d4ea /test/web/admin_api/admin_api_controller_test.exs | |
| parent | bf5b1c7f06c9f8882c40cf2385439bee3b74522c (diff) | |
| parent | 1d17082ab2523eb75ee0ca4a49e45da0d0edabd7 (diff) | |
| download | pleroma-04b1c135543965860029557fc216eb38fd63b6c7.tar.gz pleroma-04b1c135543965860029557fc216eb38fd63b6c7.zip | |
Merge remote-tracking branch 'upstream/develop' into patch-image-description
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
| -rw-r--r-- | test/web/admin_api/admin_api_controller_test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 42450a7b6..a27c26f95 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -5,7 +5,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do use Pleroma.Web.ConnCase - alias Pleroma.{Repo, User} + alias Pleroma.Repo + alias Pleroma.User import Pleroma.Factory describe "/api/pleroma/admin/user" do |