logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 6518644db1d31f2b30b95fa0899b3751bc330d56
parent: d26998c2ac4592471ec38b9bb63366ea29219749
Author: rinpatch <rinpatch@sdf.org>
Date:   Tue,  7 May 2019 02:35:31 +0000

Merge branch 'unused-config-parameter' into 'develop'

unused config paramater

See merge request pleroma/pleroma!1124

Diffstat:

Mconfig/config.exs3+--
Mdocs/config.md5++---
2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/config/config.exs b/config/config.exs @@ -232,8 +232,7 @@ config :pleroma, :instance, welcome_message: nil, max_report_comment_size: 1000, safe_dm_mentions: false, - healthcheck: false, - repo_batch_size: 500 + healthcheck: false config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because diff --git a/docs/config.md b/docs/config.md @@ -104,7 +104,6 @@ config :pleroma, Pleroma.Emails.Mailer, * `max_report_comment_size`: The maximum size of the report comment (Default: `1000`) * `safe_dm_mentions`: If set to true, only mentions at the beginning of a post will be used to address people in direct messages. This is to prevent accidental mentioning of people when talking about them (e.g. "@friend hey i really don't like @enemy"). (Default: `false`) * `healthcheck`: if set to true, system data will be shown on ``/api/pleroma/healthcheck``. -* `repo_batch_size`: Repo batch size. The number of loaded rows from the database to the memory for processing chunks. E.g. deleting user statuses. ## :logger * `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog, and `Quack.Logger` to log to Slack @@ -170,13 +169,13 @@ config :pleroma, :frontend_configurations, These settings **need to be complete**, they will override the defaults. -NOTE: for versions < 1.0, you need to set [`:fe`](#fe) to false, as shown a few lines below. +NOTE: for versions < 1.0, you need to set [`:fe`](#fe) to false, as shown a few lines below. ## :fe __THIS IS DEPRECATED__ If you are using this method, please change it to the [`frontend_configurations`](#frontend_configurations) method. -Please **set this option to false** in your config like this: +Please **set this option to false** in your config like this: ```elixir config :pleroma, :fe, false