diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-04-02 09:39:29 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-02 09:39:29 +0100 |
| commit | e6f59296a3e89276a3c9511ec61023d0f54c27e3 (patch) | |
| tree | e944e14d61d179edd606d733309ea63b632749be /config/environment.rb | |
| parent | b2291c5d3e77c9d97a61bcb63cc4ee5449476a01 (diff) | |
| parent | e5aa5333d4250f6d2590aea6fcee6379350863cf (diff) | |
Merge remote-tracking branch 'openaustralia_github/https_in_emails' into hotfix/0.8.0.1hotfix/0.8.0.1
Diffstat (limited to 'config/environment.rb')
| -rw-r--r-- | config/environment.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/environment.rb b/config/environment.rb index fae6405c4..8a5c7a605 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -116,6 +116,9 @@ end # Domain for URLs (so can work for scripts, not just web pages) ActionMailer::Base.default_url_options[:host] = Configuration::domain +if Configuration::force_ssl + ActionMailer::Base.default_url_options[:protocol] = "https" +end # fallback locale and available locales available_locales = Configuration::available_locales.split(/ /) |