projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/1342
[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 0dee670af7a346f4219fcc9b0ae77886badc9d15..d9e51de7f27757c54d2ea2701669bec692052517 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
@@
-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
@@
-75,7
+75,7
@@
defmodule Pleroma.Web.MastodonAPI.AuthController do
defp local_mastodon_root_path(conn) do
case get_session(conn, :return_to) do
nil ->
defp local_mastodon_root_path(conn) do
case get_session(conn, :return_to) do
nil ->
- masto
don_api
_path(conn, :index, ["getting-started"])
+ masto
_fe
_path(conn, :index, ["getting-started"])
return_to ->
delete_session(conn, :return_to)
return_to ->
delete_session(conn, :return_to)