projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into restrict-domain
[akkoma]
/
lib
/
pleroma
/
web
/
endpoint.ex
diff --git
a/lib/pleroma/web/endpoint.ex
b/lib/pleroma/web/endpoint.ex
index db39715588a609245d4889c23313cd585bbdf924..56562c12fc5ed46a6c3efcd00ac955a2e51e2afd 100644
(file)
--- a/
lib/pleroma/web/endpoint.ex
+++ b/
lib/pleroma/web/endpoint.ex
@@
-11,7
+11,7
@@
defmodule Pleroma.Web.Endpoint do
plug(Pleroma.Web.Plugs.SetLocalePlug)
plug(CORSPlug)
plug(Pleroma.Web.Plugs.SetLocalePlug)
plug(CORSPlug)
- plug(Pleroma.Plugs.HTTPSecurityPlug)
+ plug(Pleroma.
Web.
Plugs.HTTPSecurityPlug)
plug(Pleroma.Web.Plugs.UploadedMedia)
@static_cache_control "public, no-cache"
plug(Pleroma.Web.Plugs.UploadedMedia)
@static_cache_control "public, no-cache"
@@
-29,7
+29,7
@@
defmodule Pleroma.Web.Endpoint do
)
# Careful! No `only` restriction here, as we don't know what frontends contain.
)
# Careful! No `only` restriction here, as we don't know what frontends contain.
- plug(Pleroma.Plugs.FrontendStatic,
+ plug(Pleroma.
Web.
Plugs.FrontendStatic,
at: "/",
frontend_type: :primary,
gzip: true,
at: "/",
frontend_type: :primary,
gzip: true,
@@
-41,7
+41,7
@@
defmodule Pleroma.Web.Endpoint do
plug(Plug.Static.IndexHtml, at: "/pleroma/admin/")
plug(Plug.Static.IndexHtml, at: "/pleroma/admin/")
- plug(Pleroma.Plugs.FrontendStatic,
+ plug(Pleroma.
Web.
Plugs.FrontendStatic,
at: "/pleroma/admin",
frontend_type: :admin,
gzip: true,
at: "/pleroma/admin",
frontend_type: :admin,
gzip: true,