mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-27 01:43:22 +00:00
Merge pull request #2984 from Matt-Yorkley/email_https_links2
Specify only email link protocol setting
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user