From 56f34e2d2b92a18d1e24cab6daa71b330ea5705e Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Mon, 1 Jul 2024 13:56:00 +1000 Subject: [PATCH] DEV: Unhide enable_direct_s3_uploads setting (#27659) This has been around for a long time now and was mentioned in https://meta.discourse.org/t/a-new-era-for-file-uploads-in-discourse/210469, there is no need to hide it, self-hosters are free to enable this. --- config/locales/server.en.yml | 1 + config/site_settings.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 1352735a18cc9..1c8fc40ddb4ac 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1980,6 +1980,7 @@ en: s3_configure_tombstone_policy: "Enable automatic deletion policy for tombstone uploads. IMPORTANT: If disabled, no space will be reclaimed after uploads are deleted." s3_disable_cleanup: "Prevent removal of old backups from S3 when there are more backups than the maximum allowed." s3_use_acls: "AWS recommends not using ACLs on S3 buckets; if you are following this advice, uncheck this option. This must be enabled if you are using secure uploads." + enable_direct_s3_uploads: "Allows for direct multipart uploads to Amazon S3, see https://meta.discourse.org/t/a-new-era-for-file-uploads-in-discourse/210469 for more details." backup_time_of_day: "Time of day UTC when the backup should occur." backup_with_uploads: "Include uploads in scheduled backups. Disabling this will only backup the database." backup_location: "Location where backups are stored. IMPORTANT: S3 requires valid S3 credentials entered in Files settings." diff --git a/config/site_settings.yml b/config/site_settings.yml index b361acee5022a..7da9941986c96 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -291,7 +291,6 @@ basic: enable_direct_s3_uploads: client: true default: false - hidden: true enable_upload_debug_mode: default: false hidden: true