diff options
| author | Ekaterina Vaartis <vaartis@kotobank.ch> | 2022-12-20 21:00:07 +0300 |
|---|---|---|
| committer | Ekaterina Vaartis <vaartis@kotobank.ch> | 2022-12-20 21:00:07 +0300 |
| commit | 398141da68328cea982f017a3e8bc95a9f9c1fbf (patch) | |
| tree | fa66f1417d86de3665a854fbbbf4b01987e5a51d /config/config.exs | |
| parent | 5a39866388c411f2bcee9848352f8c420513f34f (diff) | |
| parent | 5910d58cf7f468722b3774622b6b40a07b5d6444 (diff) | |
| download | pleroma-398141da68328cea982f017a3e8bc95a9f9c1fbf.tar.gz pleroma-398141da68328cea982f017a3e8bc95a9f9c1fbf.zip | |
Merge remote-tracking branch 'upstream/develop' into meilisearch
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/config/config.exs b/config/config.exs index ce9338014..52319ce49 100644 --- a/config/config.exs +++ b/config/config.exs @@ -160,11 +160,6 @@ config :logger, :ex_syslogger, format: "$metadata[$level] $message", metadata: [:request_id] -config :quack, - level: :warn, - meta: [:all], - webhook_url: "https://hooks.slack.com/services/YOUR-KEY-HERE" - config :mime, :types, %{ "application/xml" => ["xml"], "application/xrd+xml" => ["xrd+xml"], @@ -228,6 +223,7 @@ config :pleroma, :instance, max_pinned_statuses: 1, attachment_links: false, max_report_comment_size: 1000, + report_strip_status: true, safe_dm_mentions: false, healthcheck: false, remote_post_retention_days: 90, @@ -758,12 +754,12 @@ config :pleroma, :frontends, "https://git.pleroma.social/pleroma/admin-fe/-/jobs/artifacts/${ref}/download?job=build", "ref" => "develop" }, - "soapbox-fe" => %{ - "name" => "soapbox-fe", - "git" => "https://gitlab.com/soapbox-pub/soapbox-fe", + "soapbox" => %{ + "name" => "soapbox", + "git" => "https://gitlab.com/soapbox-pub/soapbox", "build_url" => - "https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/${ref}/download?job=build-production", - "ref" => "v1.0.0", + "https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/${ref}/download?job=build-production", + "ref" => "v3.0.0-beta.1", "build_dir" => "static" }, "glitch-lily" => %{ @@ -872,6 +868,8 @@ config :pleroma, ConcurrentLimiter, [ {Pleroma.Search, [max_running: 30, max_waiting: 50]} ] +config :pleroma, Pleroma.Web.WebFinger, domain: nil, update_nickname_on_user_fetch: true + config :pleroma, Pleroma.Search, module: Pleroma.Search.DatabaseSearch config :pleroma, Pleroma.Search.Meilisearch, |