From 4dbb08a19f57e720e299608ebeb4387d37c55e99 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sat, 6 Feb 2021 13:20:58 -0600
Subject: [PATCH] Improved Mailer descriptions
---
CHANGELOG.md | 3 ++-
config/description.exs | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dbdb3f4e..15c75353f 100644
--- 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 650b504c1..8eefa2ba1 100644
--- 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},