diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-22 09:31:43 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-22 09:31:43 +0300 |
| commit | 8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160 (patch) | |
| tree | f14a1ef01c90124b33b2866117ed2995e32ab369 /config | |
| parent | 0d14c3f41053f97d23fa9295745a817c08010969 (diff) | |
| parent | 114e7b764ed5ae03211cca40e7b19f33292b3d1c (diff) | |
| download | pleroma-8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160.tar.gz pleroma-8f0ca19b9cafeedc70df2d60bd7bd7c6bf7aa160.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
# CHANGELOG.md
# config/config.exs
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index c5a56b14d..a92130ec8 100644 --- a/config/config.exs +++ b/config/config.exs @@ -327,7 +327,8 @@ config :pleroma, :activitypub, outgoing_blocks: true, follow_handshake_timeout: 500, note_replies_output_limit: 5, - sign_object_fetches: true + sign_object_fetches: true, + authorized_fetch_mode: false config :pleroma, :streamer, workers: 3, @@ -618,6 +619,8 @@ config :pleroma, :modules, runtime_dir: "instance/modules" config :pleroma, configurable_from_database: false +config :pleroma, Pleroma.Repo, parameters: [gin_fuzzy_search_limit: "500"] + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |