projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into stable
[akkoma]
/
lib
/
pleroma
/
web
/
endpoint.ex
diff --git
a/lib/pleroma/web/endpoint.ex
b/lib/pleroma/web/endpoint.ex
index 6dd66a424a0d11f9f58a18a204ef219ae63170a6..e3a251ca196be2138a60a8c832915f8aec0e748c 100644
(file)
--- a/
lib/pleroma/web/endpoint.ex
+++ b/
lib/pleroma/web/endpoint.ex
@@
-13,6
+13,7
@@
defmodule Pleroma.Web.Endpoint do
plug(Pleroma.Web.Plugs.SetLocalePlug)
plug(CORSPlug)
plug(Pleroma.Web.Plugs.SetLocalePlug)
plug(CORSPlug)
+ plug(Pleroma.Web.Plugs.CSPNoncePlug)
plug(Pleroma.Web.Plugs.HTTPSecurityPlug)
plug(Pleroma.Web.Plugs.UploadedMedia)
plug(Pleroma.Web.Plugs.HTTPSecurityPlug)
plug(Pleroma.Web.Plugs.UploadedMedia)
@@
-123,7
+124,7
@@
defmodule Pleroma.Web.Endpoint do
plug(Plug.Parsers,
parsers: [
:urlencoded,
plug(Plug.Parsers,
parsers: [
:urlencoded,
-
{:multipart, length: {Config, :get, [[:instance, :upload_limit]]}}
,
+
Pleroma.Web.Plugs.Parsers.Multipart
,
:json
],
pass: ["*/*"],
:json
],
pass: ["*/*"],