From 49bd0660373e99cbbdaf24fe296c1386e578cb89 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Thu, 17 Sep 2020 14:15:02 +1000 Subject: [PATCH] FEATURE: Default allow embed secure images in email to true (#10688) We are making the changes from the PR #10563 the default behaviour. Now, if secure media is enabled, secure images will be embedded in emails by default instead of redacting them and displaying a message. This will be a nicer overall experience by default, and for forums that want to be super strict with redaction this setting can always be disabled. --- config/site_settings.yml | 2 +- spec/components/email/sender_spec.rb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config/site_settings.yml b/config/site_settings.yml index 3853edd4ad2..fa32b4f989c 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1236,7 +1236,7 @@ files: default: false client: true secure_media_allow_embed_images_in_emails: - default: false + default: true secure_media_max_email_embed_image_size_kb: default: 1024 min: 1 diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb index 7525171eb1b..38d4f270d2b 100644 --- a/spec/components/email/sender_spec.rb +++ b/spec/components/email/sender_spec.rb @@ -4,6 +4,9 @@ require 'rails_helper' require 'email/sender' describe Email::Sender do + before do + SiteSetting.secure_media_allow_embed_images_in_emails = false + end fab!(:post) { Fabricate(:post) } context "disable_emails is enabled" do