diff options
| author | lain <lain@soykaf.club> | 2019-06-15 15:09:14 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-06-15 15:09:14 +0000 |
| commit | 37ee6c6e2cfcb6eaffc028cfd87e938bf521d7e8 (patch) | |
| tree | dfcd1e584d7c0f357f093ec7457691bde5a447a5 /lib | |
| parent | 52b1b0e45dbc0835cc81530cae0e85cb1264c905 (diff) | |
| parent | 9b908697dd542f43c94ebb7bbc7a7b22310bf1ad (diff) | |
| download | pleroma-37ee6c6e2cfcb6eaffc028cfd87e938bf521d7e8.tar.gz pleroma-37ee6c6e2cfcb6eaffc028cfd87e938bf521d7e8.zip | |
Merge branch 'update/phoenix-and-plug' into 'develop'
Update Phoenix
See merge request pleroma/pleroma!1290
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/router.ex | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 0e3f73226..837153ed4 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -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) |