diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-03-14 22:33:20 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-03-14 22:33:20 +0300 |
| commit | cbdd11c38111fd7c195983f40265b675e1201d4e (patch) | |
| tree | 44c63ed6430a743cfe589fed5213467a0dd6dabb /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | 355f285a8693934fbc8205c2c9ecde0a758fc158 (diff) | |
| parent | 34fc0dca2e879bcbb73acc80fdc72678411d0ebf (diff) | |
| download | pleroma-cbdd11c38111fd7c195983f40265b675e1201d4e.tar.gz | |
Merge develop to bump elixir version in the CI so I don't get failing formatting
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index e2fdedb25..8ed02a93f 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -10,13 +10,13 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do alias Comeonin.Pbkdf2 alias Pleroma.Emoji alias Pleroma.PasswordResetToken - alias Pleroma.User alias Pleroma.Repo + alias Pleroma.User alias Pleroma.Web + alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.CommonAPI alias Pleroma.Web.OStatus alias Pleroma.Web.WebFinger - alias Pleroma.Web.ActivityPub.ActivityPub def show_password_reset(conn, %{"token" => token}) do with %{used: false} = token <- Repo.get_by(PasswordResetToken, %{token: token}), |