diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-08 14:10:45 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-08 14:10:59 +0300 |
| commit | edb659dc579fe56227adef0b0704ff13b6ef717e (patch) | |
| tree | e9d48cd8afd99877d5b4c696d8b7a62a9d2121bd /config/config.exs | |
| parent | 10f452ad1feae9a882b6dc4cd35e09adb7e78208 (diff) | |
| parent | 6d797b99282ff1067c6af04b3e1775ff2281333b (diff) | |
| download | pleroma-edb659dc579fe56227adef0b0704ff13b6ef717e.tar.gz pleroma-edb659dc579fe56227adef0b0704ff13b6ef717e.zip | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 9d1e29c0d..2cd741213 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}, @@ -621,7 +624,9 @@ config :pleroma, :modules, runtime_dir: "instance/modules" config :pleroma, configurable_from_database: false -config :pleroma, Pleroma.Repo, parameters: [gin_fuzzy_search_limit: "500"] +config :pleroma, Pleroma.Repo, + parameters: [gin_fuzzy_search_limit: "500"], + prepare: :unnamed # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. |