diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-05-05 14:28:54 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-05-05 14:28:54 +0400 |
| commit | decaa64f75f8bd69622fa5fba757f99719f09808 (patch) | |
| tree | 52d3bfc7318230beae31865c7f0a12e02b7f68b5 /config | |
| parent | 764b4f95a8e9e751d5a6136fc2be44d61a082443 (diff) | |
| parent | c297667f16db40654bb16608c01dc4a2dc7c0e4b (diff) | |
| download | pleroma-decaa64f75f8bd69622fa5fba757f99719f09808.tar.gz pleroma-decaa64f75f8bd69622fa5fba757f99719f09808.zip | |
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/config/config.exs b/config/config.exs index 7ace09b87..57072d3e6 100644 --- a/config/config.exs +++ b/config/config.exs @@ -564,8 +564,6 @@ 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 21623197d..12cd66cd5 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2262,6 +2262,7 @@ config :pleroma, :config_description, [ children: [ %{ key: :active, + label: "Enabled", type: :boolean, description: "Globally enable or disable digest emails" }, @@ -2290,20 +2291,6 @@ 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", |