diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-20 20:37:56 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-20 20:37:56 +0400 |
| commit | 364eecc49f137ae3c7798ad240983591e27b134c (patch) | |
| tree | 7ed228221db9794b0aae59fa0e548623c0aa12ae /config | |
| parent | dc8fa04192cc133749e762b78ec043e0902d046d (diff) | |
| parent | 28165dad3ac02a6d3ba4b0cda51992a1831515dd (diff) | |
| download | pleroma-364eecc49f137ae3c7798ad240983591e27b134c.tar.gz pleroma-364eecc49f137ae3c7798ad240983591e27b134c.zip | |
Merge branch 'develop' into global-status-expiration
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 8670a57b9..2517fed59 100644 --- a/config/config.exs +++ b/config/config.exs @@ -240,6 +240,8 @@ config :pleroma, :instance, extended_nickname_format: true, cleanup_attachments: false +config :pleroma, :extensions, output_relationships_in_statuses_by_default: true + config :pleroma, :feed, post_title: %{ max_length: 100, @@ -561,6 +563,8 @@ config :pleroma, :email_notifications, inactivity_threshold: 7 } +config :pleroma, :notifications, enable_follow_request_notifications: false + config :pleroma, :oauth2, token_expires_in: 600, issue_new_refresh_token: true, diff --git a/config/description.exs b/config/description.exs index b34794da1..ef5022c2a 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2284,6 +2284,20 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, + key: :notifications, + type: :group, + description: "Notification settings", + children: [ + %{ + key: :enable_follow_request_notifications, + type: :boolean, + description: + "Enables notifications on new follow requests (causes issues with older PleromaFE versions)." + } + ] + }, + %{ + group: :pleroma, key: Pleroma.Emails.UserEmail, type: :group, description: "Email template settings", |