Merge remote-tracking branch 'pleroma/develop' into manifest

diff --cc lib/pleroma/web/router.ex
index c3b74e622efa34c21703d1ddf58f0dc311509863,abb332ec2f1f9eed9b232f83fa34f50b0fa7b654..afdc4f492062a291d9260e669ed773e664d3939c
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -744,31 -736,6 +736,12 @@@ defmodule Pleroma.Web.Router d
      get("/:version", Nodeinfo.NodeinfoController, :nodeinfo)
    end
  
-   scope "/", Pleroma.Web do
-     pipe_through(:api)
- 
-     get("/web/manifest.json", MastoFEController, :manifest)
-   end
- 
 +  scope "/", Pleroma.Web do
 +    pipe_through(:api)
 +
 +    get("/manifest.json", ManifestController, :show)
 +  end
 +
-   scope "/", Pleroma.Web do
-     pipe_through(:mastodon_html)
- 
-     get("/web/login", MastodonAPI.AuthController, :login)
-     delete("/auth/sign_out", MastodonAPI.AuthController, :logout)
- 
-     post("/auth/password", MastodonAPI.AuthController, :password_reset)
- 
-     get("/web/*path", MastoFEController, :index)
- 
-     get("/embed/:id", EmbedController, :show)
-   end
- 
    scope "/proxy/", Pleroma.Web do
      get("/preview/:sig/:url", MediaProxy.MediaProxyController, :preview)
      get("/preview/:sig/:url/:filename", MediaProxy.MediaProxyController, :preview)

diff --cc test/pleroma/web/plugs/frontend_static_plug_test.exs
index a1cce6398e0a2c89e08e857d1de48e683bde8b34,a9342e6f02306906a19ce36fa1365aea9a9fd408..93d0ab469a22b9c320c451d276b066e27066e4c6
--- 1/test/pleroma/web/plugs/frontend_static_plug_test.exs
--- 2/test/pleroma/web/plugs/frontend_static_plug_test.exs
+++ b/test/pleroma/web/plugs/frontend_static_plug_test.exs
@@@ -94,10 -94,6 +94,7 @@@ defmodule Pleroma.Web.Plugs.FrontendSta
        "internal",
        ".well-known",
        "nodeinfo",
-       "web",
 +      "manifest.json",
-       "auth",
-       "embed",
        "proxy",
        "test",
        "user_exists",