diff options
| author | lambda <lain@soykaf.club> | 2019-03-13 09:09:44 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-03-13 09:09:44 +0000 |
| commit | 92a0210fb03ca3e0aefe769fb6b0ab7bda6e5336 (patch) | |
| tree | 56e78105e29834c60f73c1bf8c39a983d88421a4 /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | d0e94d5f1baac7a19d6cdd33b1f54470041e7227 (diff) | |
| parent | d43b1c0b5d203fd4f195951ac7b60b666a43914f (diff) | |
| download | pleroma-92a0210fb03ca3e0aefe769fb6b0ab7bda6e5336.tar.gz | |
Merge branch 'features/add-credo-to-ci' into 'develop'
Add credo to CI
See merge request pleroma/pleroma!902
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}), |