projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'featrue/job-monitor' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
oauth
/
oauth_controller.ex
diff --git
a/lib/pleroma/web/oauth/oauth_controller.ex
b/lib/pleroma/web/oauth/oauth_controller.ex
index e418dc70d7bc7db486397db43195a8fbd99d2d05..1cd7294e74925ec4cacf3ce56278194c91147af8 100644
(file)
--- a/
lib/pleroma/web/oauth/oauth_controller.ex
+++ b/
lib/pleroma/web/oauth/oauth_controller.ex
@@
-460,7
+460,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
end
# Special case: Local MastodonFE
end
# Special case: Local MastodonFE
- defp redirect_uri(%Plug.Conn{} = conn, "."), do:
mastodon_api
_url(conn, :login)
+ defp redirect_uri(%Plug.Conn{} = conn, "."), do:
auth
_url(conn, :login)
defp redirect_uri(%Plug.Conn{}, redirect_uri), do: redirect_uri
defp redirect_uri(%Plug.Conn{}, redirect_uri), do: redirect_uri