Merge pull request #2984 from Matt-Yorkley/email_https_links2

Specify only email link protocol setting
This commit is contained in:
Pau Pérez Fabregat
2018-11-14 11:26:14 +01:00
committed by GitHub
3 changed files with 6 additions and 6 deletions

View File

@@ -30,6 +30,9 @@ Openfoodnetwork::Application.configure do
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
config.force_ssl = true
# Use https in email links
config.action_mailer.default_url_options = { protocol: 'https' }
# See everything in the log (default is :info)
config.log_level = :info

View File

@@ -30,6 +30,9 @@ Openfoodnetwork::Application.configure do
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
config.force_ssl = true
# Use https in email links
config.action_mailer.default_url_options = { protocol: 'https' }
# See everything in the log (default is :info)
# config.log_level = :debug

View File

@@ -1,6 +0,0 @@
ActionMailer::Base.configure do |config|
if Rails.env.production? || Rails.env.staging?
# Use https when creating links in emails
config.default_url_options = { protocol: 'https', host: Spree::Config[:site_url] }
end
end