From 92efb888c7b25692af205b1a4dbce0ae689c439b Mon Sep 17 00:00:00 2001
From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Fri, 1 May 2020 09:51:41 +0300
Subject: Made follow request notifications non-optional (removed config
 switch).

---
 config/config.exs      |  2 --
 config/description.exs | 14 --------------
 2 files changed, 16 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 2e538c4be..a6c6d6f99 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -562,8 +562,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 7fac1e561..9d8e3b93c 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2273,20 +2273,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,
-- 
cgit v1.2.3


From 2ab52d52248224c61b857f2fc54adff80343e3c0 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Mon, 4 May 2020 22:41:14 +0300
Subject: Fix inconsistency in language for activating settings

---
 config/description.exs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 7fac1e561..62f17c92f 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2247,6 +2247,7 @@ config :pleroma, :config_description, [
         children: [
           %{
             key: :active,
+            label: "Enabled",
             type: :boolean,
             description: "Globally enable or disable digest emails"
           },
-- 
cgit v1.2.3