projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ci-test-fix' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
endpoint.ex
diff --git
a/lib/pleroma/web/endpoint.ex
b/lib/pleroma/web/endpoint.ex
index e52667c72691245aabb10e1b06ae9788526478dc..564fc2c1d446a314668d1de3c0f8447f8ca4e2d4 100644
(file)
--- a/
lib/pleroma/web/endpoint.ex
+++ b/
lib/pleroma/web/endpoint.ex
@@
-12,12
+12,16
@@
defmodule Pleroma.Web.Endpoint do
plug(Pleroma.Plugs.UploadedMedia)
plug(Pleroma.Plugs.UploadedMedia)
+ # InstanceStatic needs to be before Plug.Static to be able to override shipped-static files
+ # If you're adding new paths to `only:` you'll need to configure them in InstanceStatic as well
+ plug(Pleroma.Plugs.InstanceStatic, at: "/")
+
plug(
Plug.Static,
at: "/",
from: :pleroma,
only:
plug(
Plug.Static,
at: "/",
from: :pleroma,
only:
- ~w(index.html static finmoji emoji packs sounds images instance sw.js favicon.png schemas)
+ ~w(index.html static finmoji emoji packs sounds images instance sw.js favicon.png schemas
doc
)
)
# Code reloading can be explicitly enabled under the
)
# Code reloading can be explicitly enabled under the