diff options
| author | lain <lain@soykaf.club> | 2020-04-20 12:37:17 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-20 12:37:17 +0200 |
| commit | 139b9d1338618aa0107c188a9a5505c6615768be (patch) | |
| tree | 2a46e24596a199473feed97b068c088edff848bd /config | |
| parent | 970b74383b43aa9a54c3cf59012944355e3eafbc (diff) | |
| parent | 918a8094fc175ed71ccb7305d606fb0b221163f6 (diff) | |
| download | pleroma-139b9d1338618aa0107c188a9a5505c6615768be.tar.gz pleroma-139b9d1338618aa0107c188a9a5505c6615768be.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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", |