aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-02-09 16:20:18 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-02-09 16:31:17 +0100
commitd924dc73ba9d4031c73cfa0cc810d3b2b2759b1d (patch)
tree0043abdc8b20552623816ec5b7141f3b56f8e1a8
parent6a6a5b3251f7137e30b687a9a8448e678446f8b0 (diff)
downloadpleroma-d924dc73ba9d4031c73cfa0cc810d3b2b2759b1d.tar.gz
de-group import/s
-rw-r--r--lib/pleroma/instances/instance.ex3
-rw-r--r--lib/pleroma/web/oauth/app.ex2
-rw-r--r--lib/pleroma/web/oauth/authorization.ex3
-rw-r--r--lib/pleroma/web/web.ex7
4 files changed, 10 insertions, 5 deletions
diff --git a/lib/pleroma/instances/instance.ex b/lib/pleroma/instances/instance.ex
index ce3b46d50..48bc939dd 100644
--- a/lib/pleroma/instances/instance.ex
+++ b/lib/pleroma/instances/instance.ex
@@ -7,7 +7,8 @@ defmodule Pleroma.Instances.Instance do
use Ecto.Schema
- import Ecto.{Query, Changeset}
+ import Ecto.Query
+ import Ecto.Changeset
schema "instances" do
field(:host, :string)
diff --git a/lib/pleroma/web/oauth/app.ex b/lib/pleroma/web/oauth/app.ex
index 967ac04b5..3e8acde31 100644
--- a/lib/pleroma/web/oauth/app.ex
+++ b/lib/pleroma/web/oauth/app.ex
@@ -4,7 +4,7 @@
defmodule Pleroma.Web.OAuth.App do
use Ecto.Schema
- import Ecto.{Changeset}
+ import Ecto.Changeset
schema "apps" do
field(:client_name, :string)
diff --git a/lib/pleroma/web/oauth/authorization.ex b/lib/pleroma/web/oauth/authorization.ex
index ea742f678..75c9ab9aa 100644
--- a/lib/pleroma/web/oauth/authorization.ex
+++ b/lib/pleroma/web/oauth/authorization.ex
@@ -10,7 +10,8 @@ defmodule Pleroma.Web.OAuth.Authorization do
alias Pleroma.Web.OAuth.Authorization
alias Pleroma.Web.OAuth.App
- import Ecto.{Changeset, Query}
+ import Ecto.Changeset
+ import Ecto.Query
schema "oauth_authorizations" do
field(:token, :string)
diff --git a/lib/pleroma/web/web.ex b/lib/pleroma/web/web.ex
index 4d5fd028e..853aa2a87 100644
--- a/lib/pleroma/web/web.ex
+++ b/lib/pleroma/web/web.ex
@@ -24,7 +24,8 @@ defmodule Pleroma.Web do
quote do
use Phoenix.Controller, namespace: Pleroma.Web
import Plug.Conn
- import Pleroma.Web.{Gettext, Router.Helpers}
+ import Pleroma.Web.Gettext
+ import Pleroma.Web.Router.Helpers
end
end
@@ -37,7 +38,9 @@ defmodule Pleroma.Web do
# Import convenience functions from controllers
import Phoenix.Controller, only: [get_csrf_token: 0, get_flash: 2, view_module: 1]
- import Pleroma.Web.{ErrorHelpers, Gettext, Router.Helpers}
+ import Pleroma.Web.ErrorHelpers
+ import Pleroma.Web.Gettext
+ import Pleroma.Web.Router.Helpers
require Logger