hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into apps-api-endpoint

Browse source
This commit is contained in:
Alex Gleason 2021-12-27 18:01:25 -06:00
commit f5c3d45120
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
3865 changed files with 4840 additions and 12084 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/o_auth/o_auth_controller.ex
View file

@ -597,9 +597,6 @@ defmodule Pleroma.Web.OAuth.OAuthController do
end
end
# Special case: Local MastodonFE
defp redirect_uri(%Plug.Conn{} = conn, "."), do: Routes.auth_url(conn, :login)
defp redirect_uri(%Plug.Conn{}, redirect_uri), do: redirect_uri
defp get_session_registration_id(%Plug.Conn{} = conn), do: get_session(conn, :registration_id)