diff options
| author | feld <feld@feld.me> | 2019-10-04 14:16:28 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-10-04 14:16:28 +0000 |
| commit | 31e57cd1b34798afb07a8de4c0c95ef3c15e22ed (patch) | |
| tree | 461d3d50b855d080eb17f0946213168a87ac7625 /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | b8b98ac40f042a8c3d2562edc095f0e1a309760f (diff) | |
| parent | 27110793a7d8e3aa6434bde63a1f687424ae779c (diff) | |
| download | pleroma-31e57cd1b34798afb07a8de4c0c95ef3c15e22ed.tar.gz | |
Merge branch 'develop' into 'fix/extended-nickname-format-default-config'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index e418dc70d..1cd7294e7 100644 --- 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 |