diff options
| author | lain <lain@soykaf.club> | 2020-01-30 18:47:44 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-30 18:47:44 +0000 |
| commit | 774cba84f50b7ebc4eef3406467aafa5fa76dff7 (patch) | |
| tree | 3a6d7d262fc798a73e33e73c46bb8bae45781d64 /lib | |
| parent | e52e78a93731db46f35552d79db1d9083be0235f (diff) | |
| parent | 01537cc1d6a290f6a9002b331b18986036300634 (diff) | |
| download | pleroma-774cba84f50b7ebc4eef3406467aafa5fa76dff7.tar.gz | |
Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
Re-enable rate limiter and enable remote ip
See merge request pleroma/pleroma!2164
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/plugs/remote_ip.ex | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/pleroma/plugs/remote_ip.ex b/lib/pleroma/plugs/remote_ip.ex index fdedc27ee..1cd5af48a 100644 --- a/lib/pleroma/plugs/remote_ip.ex +++ b/lib/pleroma/plugs/remote_ip.ex @@ -10,10 +10,7 @@ defmodule Pleroma.Plugs.RemoteIp do @behaviour Plug @headers ~w[ - forwarded x-forwarded-for - x-client-ip - x-real-ip ] # https://en.wikipedia.org/wiki/Localhost |