Improved Mailer descriptions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dbdb3f4e04175052b9396185b8718742a49afbc..15c75353f6bdfb698a294155b6c164629bbcb8ca 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Deprecated `Pleroma.Uploaders.S3, :public_endpoint`. Now `Pleroma.Upload, :base_url` is the standard configuration key for all uploaders.
 - Improved Apache webserver support: updated sample configuration, MediaProxy cache invalidation verified with the included sample script
 - Improve OAuth 2.0 provider support. A missing `fqn` field was added to the response, but does not expose the user's email address.
-- Provide redirect of external posts from `/notice/:id` to their original URL
+- Provide redirect of external posts from `/notice/:id` to their original URL.
+- Improved Mailer configuration setting descriptions for AdminFE.
 
 <details>
   <summary>API Changes</summary>

diff --git a/config/description.exs b/config/description.exs
index 650b504c10f94b02fc2286cb2c4f5cbde1a66e2a..8eefa2ba1890c3551760304b61162d4f37d49002 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -217,7 +217,7 @@ config :pleroma, :config_description, [
       %{
         key: :enabled,
         label: "Mailer Enabled",
-        type: :boolean,
+        type: :boolean
       },
       %{
         key: :adapter,
@@ -320,7 +320,7 @@ config :pleroma, :config_description, [
         group: {:subgroup, Swoosh.Adapters.Sendmail},
         key: :qmail,
         label: "Qmail compat mode",
-        type: :boolean,
+        type: :boolean
       },
       %{
         group: {:subgroup, Swoosh.Adapters.Mandrill},