diff options
| author | kPherox <admin@mail.kr-kp.com> | 2019-10-01 01:39:22 +0900 |
|---|---|---|
| committer | kPherox <admin@mail.kr-kp.com> | 2019-10-01 01:40:33 +0900 |
| commit | a0f101ee806af06bcd4271cd8d57d11ff85ea11a (patch) | |
| tree | 2cd3c5d1a645be1395c57ec5616f31afb4b68da7 /lib/pleroma/web/endpoint.ex | |
| parent | 8ca4f145a51e92c9f3a6c374ceddfac22ea300d9 (diff) | |
| parent | 7c9b023a918c84b60ae6547289a083c671a3659b (diff) | |
| download | pleroma-a0f101ee806af06bcd4271cd8d57d11ff85ea11a.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
Diffstat (limited to 'lib/pleroma/web/endpoint.ex')
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index c123530dc..2212e93f4 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -57,7 +57,7 @@ defmodule Pleroma.Web.Endpoint do plug(Phoenix.CodeReloader) end - plug(TrailingFormatPlug) + plug(Pleroma.Plugs.TrailingFormatPlug) plug(Plug.RequestId) plug(Plug.Logger) @@ -97,10 +97,7 @@ defmodule Pleroma.Web.Endpoint do extra: extra ) - # Note: the plug and its configuration is compile-time this can't be upstreamed yet - if proxies = Pleroma.Config.get([__MODULE__, :reverse_proxies]) do - plug(RemoteIp, proxies: proxies) - end + plug(Pleroma.Plugs.RemoteIp) defmodule Instrumenter do use Prometheus.PhoenixInstrumenter |