Merge branch 'develop' into global-status-expiration

2020-04-20 20:37:56 +04:00 · 2020-04-20 20:37:56 +04:00 · 364eecc49f
commit 364eecc49f
parent dc8fa04192 28165dad3a
150 changed files with 2240 additions and 1402 deletions
--- a/config/description.exs
+++ b/config/description.exs
@ -2282,6 +2282,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,