aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-08-05 16:11:23 +0200
committerlain <lain@soykaf.club>2019-08-05 16:11:23 +0200
commitd6fe220e32d581220cc33f4f44d6517a401eabbf (patch)
tree53357b0083e68c15ef0eb46891b53be7ba2f0e3a
parentddabe7784b47939120a838b9c65381fd2262c161 (diff)
downloadpleroma-d6fe220e32d581220cc33f4f44d6517a401eabbf.tar.gz
Linting.
-rw-r--r--lib/pleroma/conversation/participation_recipient_ship.ex2
-rw-r--r--lib/pleroma/web/pleroma_api/pleroma_api_controller.ex4
-rw-r--r--test/web/mastodon_api/conversation_view_test.exs2
-rw-r--r--test/web/pleroma_api/pleroma_api_controller_test.exs2
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/conversation/participation_recipient_ship.ex b/lib/pleroma/conversation/participation_recipient_ship.ex
index 27c0c89cd..932cbd04c 100644
--- a/lib/pleroma/conversation/participation_recipient_ship.ex
+++ b/lib/pleroma/conversation/participation_recipient_ship.ex
@@ -6,8 +6,8 @@ defmodule Pleroma.Conversation.Participation.RecipientShip do
use Ecto.Schema
alias Pleroma.Conversation.Participation
- alias Pleroma.User
alias Pleroma.Repo
+ alias Pleroma.User
import Ecto.Changeset
diff --git a/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex b/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
index 759d8aef0..018564452 100644
--- a/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
@@ -8,10 +8,10 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
import Pleroma.Web.ControllerHelper, only: [add_link_headers: 7]
alias Pleroma.Conversation.Participation
+ alias Pleroma.Repo
alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.MastodonAPI.ConversationView
- alias Pleroma.Repo
+ alias Pleroma.Web.MastodonAPI.StatusView
def conversation_statuses(
%{assigns: %{user: user}} = conn,
diff --git a/test/web/mastodon_api/conversation_view_test.exs b/test/web/mastodon_api/conversation_view_test.exs
index 2a4b41fa4..e32cde5a8 100644
--- a/test/web/mastodon_api/conversation_view_test.exs
+++ b/test/web/mastodon_api/conversation_view_test.exs
@@ -5,8 +5,8 @@
defmodule Pleroma.Web.MastodonAPI.ConversationViewTest do
use Pleroma.DataCase
- alias Pleroma.Web.CommonAPI
alias Pleroma.Conversation.Participation
+ alias Pleroma.Web.CommonAPI
alias Pleroma.Web.MastodonAPI.ConversationView
import Pleroma.Factory
diff --git a/test/web/pleroma_api/pleroma_api_controller_test.exs b/test/web/pleroma_api/pleroma_api_controller_test.exs
index 7989defe0..7c75fb229 100644
--- a/test/web/pleroma_api/pleroma_api_controller_test.exs
+++ b/test/web/pleroma_api/pleroma_api_controller_test.exs
@@ -6,8 +6,8 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
use Pleroma.Web.ConnCase
alias Pleroma.Conversation.Participation
- alias Pleroma.Web.CommonAPI
alias Pleroma.Repo
+ alias Pleroma.Web.CommonAPI
import Pleroma.Factory