From cf5fa23cd359adf92302d852d52b8abda0a8eed4 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Tue, 14 Feb 2023 09:41:18 +1000 Subject: [PATCH] DEV: Remove old secure_media setting (#20259) This has been renamed to secure_uploads since 8ebd5edd1e02e6fafe7732515edefec5a5dfc3f7 --- config/locales/server.en.yml | 3 --- config/site_settings.yml | 12 ------------ lib/site_settings/deprecated_settings.rb | 13 ------------- spec/fixtures/onebox/discourse_topic.response | 2 +- spec/fixtures/onebox/discourse_topic_reply.response | 2 +- 5 files changed, 2 insertions(+), 30 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 3a639766e6e..3669228720b 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2243,11 +2243,8 @@ en: bootstrap_mode_min_users: "Minimum number of users required to disable bootstrap mode (set to 0 to disable)" prevent_anons_from_downloading_files: "Prevent anonymous users from downloading attachments." - secure_media: "DEPRECATED: Use the secure_uploads setting instead, will be removed in Discourse 3.0." secure_uploads: 'Limits access to ALL uploads (images, video, audio, text, pdfs, zips, and others). If "login required” is enabled, only logged-in users can access uploads. Otherwise, access will be limited only for media uploads in private messages and private categories. WARNING: This setting is complex and requires deep administrative understanding. See the secure uploads topic on Meta for details.' - secure_media_allow_embed_images_in_emails: "DEPRECATED: Use secure_uploads_allow_embed_images_in_emails, will remove in Discourse 3.0." secure_uploads_allow_embed_images_in_emails: "Allows embedding secure images that would normally be redacted in emails, if their size is smaller than the 'secure uploads max email embed image size kb' setting." - secure_media_max_email_embed_image_size_kb: "DEPRECATED: Use secure_uploads_max_email_embed_image_size_kb, will be removed in Discourse 3.0." secure_uploads_max_email_embed_image_size_kb: "The size cutoff for secure images that will be embedded in emails if the 'secure uploads allow embed in emails' setting is enabled. Without that setting enabled, this setting has no effect." slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all." diff --git a/config/site_settings.yml b/config/site_settings.yml index 436043f0c1f..07fbb5c076a 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1395,18 +1395,6 @@ files: prevent_anons_from_downloading_files: default: false client: true - secure_media: - default: false - client: true - hidden: true - secure_media_allow_embed_images_in_emails: - default: true - hidden: true - secure_media_max_email_embed_image_size_kb: - default: 1024 - min: 1 - max: 10240 - hidden: true secure_uploads: default: false client: true diff --git a/lib/site_settings/deprecated_settings.rb b/lib/site_settings/deprecated_settings.rb index 6ac4ca69647..a8b0ace6805 100644 --- a/lib/site_settings/deprecated_settings.rb +++ b/lib/site_settings/deprecated_settings.rb @@ -10,19 +10,6 @@ module SiteSettings::DeprecatedSettings ["default_categories_regular", "default_categories_normal", true, "3.0"], ["min_trust_to_send_messages", "personal_message_enabled_groups", false, "3.0"], ["enable_personal_messages", "personal_message_enabled_groups", false, "3.0"], - ["secure_media", "secure_uploads", true, "3.0"], - [ - "secure_media_allow_embed_images_in_emails", - "secure_uploads_allow_embed_images_in_emails", - true, - "3.0", - ], - [ - "secure_media_max_email_embed_image_size_kb", - "secure_uploads_max_email_embed_image_size_kb", - true, - "3.0", - ], ] def setup_deprecated_methods diff --git a/spec/fixtures/onebox/discourse_topic.response b/spec/fixtures/onebox/discourse_topic.response index 59d61bacd7a..647d98a1488 100644 --- a/spec/fixtures/onebox/discourse_topic.response +++ b/spec/fixtures/onebox/discourse_topic.response @@ -359,7 +359,7 @@ And that too in just over an year, way to go! [boom]"> - + diff --git a/spec/fixtures/onebox/discourse_topic_reply.response b/spec/fixtures/onebox/discourse_topic_reply.response index 4e7162e0954..84548d06ccf 100644 --- a/spec/fixtures/onebox/discourse_topic_reply.response +++ b/spec/fixtures/onebox/discourse_topic_reply.response @@ -351,7 +351,7 @@ And that too in just over an year, way to go! [boom]"> - +