From 136b1b504d0dbcbf1d6908e17a0f45f78783158e Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Wed, 29 Jun 2016 15:23:50 +0800
Subject: [PATCH] Allow `force_https` to be shadowed by a global setting.

---
 config/site_settings.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 01336b31c74..150b60fb135 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -765,7 +765,9 @@ trust:
     client: true
 
 security:
-  force_https: false
+  force_https:
+    default: false
+    shadowed_by_global: true
   enable_escaped_fragments: true
   allow_index_in_robots_txt: true
   enable_noscript_support: true