projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
[akkoma]
/
test
/
web
/
ostatus
/
ostatus_controller_test.exs
diff --git
a/test/web/ostatus/ostatus_controller_test.exs
b/test/web/ostatus/ostatus_controller_test.exs
index da9c72be82b54b5cf49f059cdd4a00ad390cc36e..2950f11c0c2f8dd915d9ef424480e32367423665 100644
(file)
--- a/
test/web/ostatus/ostatus_controller_test.exs
+++ b/
test/web/ostatus/ostatus_controller_test.exs
@@
-5,9
+5,9
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
use Pleroma.Web.ConnCase
import Pleroma.Factory
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
use Pleroma.Web.ConnCase
import Pleroma.Factory
- alias Pleroma.User
- alias Pleroma.Repo
alias Pleroma.Object
alias Pleroma.Object
+ alias Pleroma.Repo
+ alias Pleroma.User
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.OStatus.ActivityRepresenter
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.OStatus.ActivityRepresenter