diff options
| author | Lain Soykaf <lain@lain.com> | 2024-03-19 16:26:02 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2024-03-19 16:26:02 +0400 |
| commit | 4e8a1b40cb7014a14d209d4438491a66246802b1 (patch) | |
| tree | 25db7854e3d1b017a4abe2ae7b7687a744da82c6 /config | |
| parent | 8a14fdbe479ca0ffb3419a83cf3c637b72dd54e0 (diff) | |
| parent | 4e37cd85ef5b1134913441166219f09220fd4942 (diff) | |
| download | pleroma-4e8a1b40cb7014a14d209d4438491a66246802b1.tar.gz pleroma-4e8a1b40cb7014a14d209d4438491a66246802b1.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into transient-validators-defaults
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 6 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 435387a64..32c8509be 100644 --- a/config/config.exs +++ b/config/config.exs @@ -415,6 +415,10 @@ config :pleroma, :mrf_follow_bot, follower_nickname: nil config :pleroma, :mrf_inline_quote, template: "<bdi>RT:</bdi> {url}" +config :pleroma, :mrf_force_mention, + mention_parent: true, + mention_quoted: true + config :pleroma, :rich_media, enabled: true, ignore_hosts: [], @@ -795,7 +799,7 @@ config :pleroma, :modules, runtime_dir: "instance/modules" config :pleroma, configurable_from_database: false config :pleroma, Pleroma.Repo, - parameters: [gin_fuzzy_search_limit: "500"], + parameters: [gin_fuzzy_search_limit: "500", jit: "off"], prepare: :unnamed config :pleroma, :connections_pool, diff --git a/config/test.exs b/config/test.exs index 9d752bdf8..80b01932c 100644 --- a/config/test.exs +++ b/config/test.exs @@ -49,7 +49,7 @@ config :pleroma, Pleroma.Repo, hostname: System.get_env("DB_HOST") || "localhost", port: System.get_env("DB_PORT") || "5432", pool: Ecto.Adapters.SQL.Sandbox, - pool_size: 50 + pool_size: System.schedulers_online() * 2 config :pleroma, :dangerzone, override_repo_pool_size: true |