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

Merge branch 'update/phoenix-and-plug' into 'develop'

Browse source 
Update Phoenix

See merge request pleroma/pleroma!1290
This commit is contained in:
lain 2019-06-15 15:09:14 +00:00
commit 37ee6c6e2c
3 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/web/router.ex
View file

@ -607,12 +607,6 @@ defmodule Pleroma.Web.Router do
post("/push/subscriptions/:id", Websub.WebsubController, :websub_incoming)
end
scope "/", Pleroma.Web do
pipe_through(:oembed)
get("/oembed", OEmbed.OEmbedController, :url)
end
pipeline :activitypub do
plug(:accepts, ["activity+json", "json"])
plug(Pleroma.Web.Plugs.HTTPSignaturePlug)