diff options
| author | Lain Soykaf <lain@lain.com> | 2024-03-17 16:42:17 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2024-03-17 16:42:17 +0400 |
| commit | 0450da88b6f10f2eb61ecb1758f9f4b4e95182c8 (patch) | |
| tree | 7ca854b7cbd63cebb6e96237b5df409ac4d422a3 /config | |
| parent | 1422082bf238b09927e036f4de9deebb164e0653 (diff) | |
| parent | 95bcd5d28f0679dc0c9443aa21d215376abb5a4e (diff) | |
| download | pleroma-0450da88b6f10f2eb61ecb1758f9f4b4e95182c8.tar.gz pleroma-0450da88b6f10f2eb61ecb1758f9f4b4e95182c8.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-fix-3241
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)", |