diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-20 18:37:45 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-20 18:40:02 +0400 |
| commit | 736fead494f6140871919308e872bb6fe5b7a196 (patch) | |
| tree | 13d9a869a8c551e7d9bb1ad07ca87f7123d74544 /config | |
| parent | 163341857a726e8d74b6ddcd1230579e4c36a1b5 (diff) | |
| parent | 28165dad3ac02a6d3ba4b0cda51992a1831515dd (diff) | |
| download | pleroma-736fead494f6140871919308e872bb6fe5b7a196.tar.gz pleroma-736fead494f6140871919308e872bb6fe5b7a196.zip | |
Merge branch 'develop' into openapi/account
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 7f013aaad..f44837e24 100644 --- a/config/config.exs +++ b/config/config.exs @@ -561,6 +561,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 642f1a3ce..b1938912c 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2269,6 +2269,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", |