diff options
| author | lain <lain@soykaf.club> | 2018-05-13 10:56:11 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-05-13 10:56:11 +0200 |
| commit | 76722ea9c8dfbb8fefe247883946aa5c872d9a49 (patch) | |
| tree | 34020541df1d6684e935cfd09f36cb6eed7b13f6 /lib/mix | |
| parent | a3d1d4894fdd8dd0133e1d2c6fde9d95f49dfcc7 (diff) | |
| parent | bb864e96ad4e0be470da78baa000019f571e30db (diff) | |
| download | pleroma-76722ea9c8dfbb8fefe247883946aa5c872d9a49.tar.gz | |
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
Diffstat (limited to 'lib/mix')
| -rw-r--r-- | lib/mix/tasks/fix_ap_users.ex | 1 | ||||
| -rw-r--r-- | lib/mix/tasks/generate_password_reset.ex | 3 | ||||
| -rw-r--r-- | lib/mix/tasks/register_user.ex | 1 | ||||
| -rw-r--r-- | lib/mix/tasks/rm_user.ex | 3 |
4 files changed, 2 insertions, 6 deletions
diff --git a/lib/mix/tasks/fix_ap_users.ex b/lib/mix/tasks/fix_ap_users.ex index 2523cdbcb..7e970850e 100644 --- a/lib/mix/tasks/fix_ap_users.ex +++ b/lib/mix/tasks/fix_ap_users.ex @@ -1,6 +1,5 @@ defmodule Mix.Tasks.FixApUsers do use Mix.Task - import Mix.Ecto import Ecto.Query alias Pleroma.{Repo, User} diff --git a/lib/mix/tasks/generate_password_reset.ex b/lib/mix/tasks/generate_password_reset.ex index e39134007..6bf640150 100644 --- a/lib/mix/tasks/generate_password_reset.ex +++ b/lib/mix/tasks/generate_password_reset.ex @@ -1,7 +1,6 @@ defmodule Mix.Tasks.GeneratePasswordReset do use Mix.Task - import Mix.Ecto - alias Pleroma.{Repo, User} + alias Pleroma.User @shortdoc "Generate password reset link for user" def run([nickname]) do diff --git a/lib/mix/tasks/register_user.ex b/lib/mix/tasks/register_user.ex index 4bec6b9d9..e74721c49 100644 --- a/lib/mix/tasks/register_user.ex +++ b/lib/mix/tasks/register_user.ex @@ -1,6 +1,5 @@ defmodule Mix.Tasks.RegisterUser do use Mix.Task - import Mix.Ecto alias Pleroma.{Repo, User} @shortdoc "Register user" diff --git a/lib/mix/tasks/rm_user.ex b/lib/mix/tasks/rm_user.ex index 6a698f360..27521b745 100644 --- a/lib/mix/tasks/rm_user.ex +++ b/lib/mix/tasks/rm_user.ex @@ -1,7 +1,6 @@ defmodule Mix.Tasks.RmUser do use Mix.Task - import Mix.Ecto - alias Pleroma.{User, Repo} + alias Pleroma.User @shortdoc "Permanently delete a user" def run([nickname]) do |