logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: bc095a27f10047e3620d1e665d29aa7b7a91a584
parent: bdf188b2a68992e8e30379d75e367eadebb07e36
Author: lain <lain@soykaf.club>
Date:   Fri,  4 Oct 2019 11:27:30 +0000

Merge branch 'fix/oauth-controller' into 'develop'

Fix OAuthController

Closes #1294

See merge request pleroma/pleroma!1780

Diffstat:

Mlib/pleroma/web/oauth/oauth_controller.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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 - 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