From b1c112952f580a5fd2c7aa4ec8d9535a78b7cc32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Fri, 4 Sep 2020 17:22:33 +0200
Subject: [PATCH] Use Rails 5 default SSL options

The default options (which apply when `force_ssl` is set, which is the
default in CONSUL) are `{ hsts: { subdomains: true } }`, which means we
tell browsers to apply our SSL settings to subdomains as well [1].
CONSUL installations implementing multitenancy with subdomains will
benefit from this change.

[1] https://api.rubyonrails.org/classes/ActionDispatch/SSL.html
---
 config/application.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/application.rb b/config/application.rb
index 363e8160e..cd56a56a2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -12,7 +12,6 @@ module Consul
 
     # Overwrite Rails 5.0 defaults and use the options we used in Rails 4
     config.active_record.belongs_to_required_by_default = false
-    config.ssl_options = {}
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.