diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-05-02 12:24:49 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-05-02 18:59:12 +0300 |
| commit | c75840f7b8a117e973713c8cb47523f09deaab79 (patch) | |
| tree | b57e316cea93db13e0572b98d533725fa152b363 /config | |
| parent | 7b0593367756adc459a7b7bbaa0ace567b97742f (diff) | |
| download | pleroma-c75840f7b8a117e973713c8cb47523f09deaab79.tar.gz pleroma-c75840f7b8a117e973713c8cb47523f09deaab79.zip | |
Merge branch 'follow-request-notifications' into 'develop'
Follow request notifications enforcement
See merge request pleroma/pleroma!2451
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/config/config.exs b/config/config.exs index 6b881e1b2..3357e23e7 100644 --- a/config/config.exs +++ b/config/config.exs @@ -581,8 +581,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 19ff55540..5a1e9e9af 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2288,20 +2288,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", |