summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.exs2
-rw-r--r--config/description.exs15
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",