diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-02 15:35:49 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-02 15:35:49 +0400 |
| commit | 4a45b96a91485a39f26bcc86b6cbd21d1547511e (patch) | |
| tree | b4a6cc3f7be26b84b85d3a1ff3adc9b896b54e85 /config/config.exs | |
| parent | f446744a6a72d707504c2ba20ea2326f956b5097 (diff) | |
| parent | 45b08ca1665920564c9daf35a96e93dff031a649 (diff) | |
| download | pleroma-4a45b96a91485a39f26bcc86b6cbd21d1547511e.tar.gz pleroma-4a45b96a91485a39f26bcc86b6cbd21d1547511e.zip | |
Merge branch 'develop' into fix/signup-without-email
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 9d1e29c0d..9c4eb70a3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -402,6 +402,8 @@ config :phoenix, :format_encoders, json: Jason config :phoenix, :json_library, Jason +config :phoenix, :filter_parameters, ["password", "confirm"] + config :pleroma, :gopher, enabled: false, ip: {0, 0, 0, 0}, @@ -597,6 +599,7 @@ config :http_signatures, config :pleroma, :rate_limit, authentication: {60_000, 15}, + timeline: {500, 3}, search: [{1000, 10}, {1000, 30}], app_account_creation: {1_800_000, 25}, relations_actions: {10_000, 10}, |