diff options
| author | feld <feld@feld.me> | 2021-05-28 18:22:27 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-05-28 18:22:27 +0000 |
| commit | 9f386df83ccc3bd2d5fc660150e8c3ad432e41f3 (patch) | |
| tree | 4dea1c03a66df86f03c86a14044da5d55e92d670 | |
| parent | a01093c505221d4a2ae2e0713680285348f4faf5 (diff) | |
| parent | bf2ee12fdb4e7d95e1cbf040a4406901b60ddfa2 (diff) | |
| download | pleroma-9f386df83ccc3bd2d5fc660150e8c3ad432e41f3.tar.gz pleroma-9f386df83ccc3bd2d5fc660150e8c3ad432e41f3.zip | |
Merge branch 'cycles-router-mediaproxy' into 'develop'
Recompilation speedup: don't make MediaProxy be a compile-dep of Router
See merge request pleroma/pleroma!3418
| -rw-r--r-- | lib/pleroma/web/router.ex | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index ccf2ef796..4b66d1471 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -765,11 +765,11 @@ defmodule Pleroma.Web.Router do get("/embed/:id", EmbedController, :show) end - scope "/proxy/", Pleroma.Web.MediaProxy do - get("/preview/:sig/:url", MediaProxyController, :preview) - get("/preview/:sig/:url/:filename", MediaProxyController, :preview) - get("/:sig/:url", MediaProxyController, :remote) - get("/:sig/:url/:filename", MediaProxyController, :remote) + scope "/proxy/", Pleroma.Web do + get("/preview/:sig/:url", MediaProxy.MediaProxyController, :preview) + get("/preview/:sig/:url/:filename", MediaProxy.MediaProxyController, :preview) + get("/:sig/:url", MediaProxy.MediaProxyController, :remote) + get("/:sig/:url/:filename", MediaProxy.MediaProxyController, :remote) end if Pleroma.Config.get(:env) == :dev do |