Merge branch 'authenticated-profile-fetching' into 'develop'

Allow profile fetching for authenticated users only.

Closes #54

See merge request pleroma/pleroma!7
This commit is contained in:
lambda 2017-11-07 18:58:22 +00:00
commit d761b1543a
2 changed files with 6 additions and 3 deletions

View file

@ -138,7 +138,6 @@ defmodule Pleroma.Web.Router do
get "/search", TwitterAPI.Controller, :search
get "/statusnet/tags/timeline/:tag", TwitterAPI.Controller, :public_and_external_timeline
get "/externalprofile/show", TwitterAPI.Controller, :external_profile
end
scope "/api", Pleroma.Web do
@ -176,6 +175,8 @@ defmodule Pleroma.Web.Router do
get "/statuses/followers", TwitterAPI.Controller, :followers
get "/statuses/friends", TwitterAPI.Controller, :friends
get "/externalprofile/show", TwitterAPI.Controller, :external_profile
end
pipeline :ostatus do