diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-15 17:11:00 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-15 17:11:00 +0300 |
| commit | 273905744242b013ba9736ff7e1415a0499022d1 (patch) | |
| tree | 146f5ad5428130dce0076ea9f6398035d7ac88f6 /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | aacbf0f57053786533df045125dee93ace0daa93 (diff) | |
| parent | 41fc67aa4993c119dae82578df7309d3999ac47a (diff) | |
| download | pleroma-273905744242b013ba9736ff7e1415a0499022d1.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
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}), |