projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
auth_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
index bfd5120ba4bfb2ffa38cf2827c3ade35d5cced20..f165c9965c1d2b8f55b591adcee08fa4df4c4bd4 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.AuthController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.AuthController do
@@
-15,7
+15,7
@@
defmodule Pleroma.Web.MastodonAPI.AuthController do
@local_mastodon_name "Mastodon-Local"
@local_mastodon_name "Mastodon-Local"
- plug(Pleroma.Plugs.RateLimiter,
:password_reset
when action == :password_reset)
+ plug(Pleroma.Plugs.RateLimiter,
[name: :password_reset]
when action == :password_reset)
@doc "GET /web/login"
def login(%{assigns: %{user: %User{}}} = conn, _params) do
@doc "GET /web/login"
def login(%{assigns: %{user: %User{}}} = conn, _params) do