aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-05-11 01:34:17 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-05-11 01:34:17 +0000
commit8d13c42926450aff6a0062f092cd1a5d59f99869 (patch)
tree0cb14ad1a42e791bee88868b5848312e2be48d73 /lib
parent17d01869ea82e1b0ad4b78479cabe0637d04d1cf (diff)
parentc953ae8c3d75beb55ba02b3bada864d019470b05 (diff)
downloadpleroma-8d13c42926450aff6a0062f092cd1a5d59f99869.tar.gz
Merge branch 'feature/adminfe' into 'develop'
Feature/adminfe See merge request pleroma/pleroma!1116
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/endpoint.ex7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index 7f939991d..9ef30e885 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -29,6 +29,13 @@ defmodule Pleroma.Web.Endpoint do
# credo:disable-for-previous-line Credo.Check.Readability.MaxLineLength
)
+ plug(Plug.Static.IndexHtml, at: "/pleroma/admin/")
+
+ plug(Plug.Static,
+ at: "/pleroma/admin/",
+ from: {:pleroma, "priv/static/adminfe/"}
+ )
+
# Code reloading can be explicitly enabled under the
# :code_reloader configuration of your endpoint.
if code_reloading? do