From 93a448bcf783423be00f2dbfe1a5f44ef2d5a5b5 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Mon, 11 Mar 2019 13:52:12 +0800
Subject: [PATCH] Revert changes in 7b601ff2f8dca3615fb72591070f5578d886b5d7.

The site setting names and global setting names are similar and that
prevents global settings from being configured via the ENV.
---
 config/site_settings.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 79b08d00237..bcf887abc25 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1030,28 +1030,23 @@ files:
   s3_access_key_id:
     default: ""
     secret: true
-    shadowed_by_global: true
   s3_secret_access_key:
     default: ""
     secret: true
-    shadowed_by_global: true
   s3_region:
     default: "us-east-1"
     enum: "S3RegionSiteSetting"
-    shadowed_by_global: true
   s3_upload_bucket:
     default: ""
     regex: '^[a-z0-9\-\/]+$' # can't use '.' when using HTTPS
   s3_endpoint:
     default: ""
     regex: '^https?:\/\/.+[^\/]$'
-    shadowed_by_global: true
   s3_cdn_url:
     default: ""
     regex: '^https?:\/\/.+[^\/]$'
   s3_force_path_style:
     default: false
-    shadowed_by_global: true
   s3_configure_tombstone_policy:
     default: true
     shadowed_by_global: true