diff options
| author | lain <lain@soykaf.club> | 2024-03-18 10:35:02 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-03-18 10:35:02 +0000 |
| commit | 2b71f4897fd95e2a6d95e092956266aea2a003db (patch) | |
| tree | 026686b46650859a3dddba5df432562da0a5a724 /config | |
| parent | d415686bb9248e1c5b8913b7c3b96f74e9b8f230 (diff) | |
| parent | cf0aa1238ccd137219253d76355f2dc0f89679ac (diff) | |
| download | pleroma-2b71f4897fd95e2a6d95e092956266aea2a003db.tar.gz pleroma-2b71f4897fd95e2a6d95e092956266aea2a003db.zip | |
Merge branch 'develop' into 'bookmark-folders'
# Conflicts:
# docs/development/API/differences_in_mastoapi_responses.md
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | config/description.exs | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 435387a64..d0496cef8 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: [], diff --git a/config/description.exs b/config/description.exs index 78e7710cb..7a9c027de 100644 --- a/config/description.exs +++ b/config/description.exs @@ -567,6 +567,20 @@ config :pleroma, :config_description, [ ] }, %{ + key: :status_page, + type: :string, + description: "A page where people can see the status of the server during an outage", + suggestions: [ + "https://status.pleroma.example.org" + ] + }, + %{ + key: :contact_username, + type: :string, + description: "Instance owner username", + suggestions: ["admin"] + }, + %{ key: :limit, type: :integer, description: "Posts character limit (CW/Subject included in the counter)", |