diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-04-02 09:49:31 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-02 09:49:31 +0100 |
| commit | a244afcb7b7185905a7a16b37ae585e239e963ea (patch) | |
| tree | f9304719d3639fc444ade1e832abc438b8fa363e /config/environment.rb | |
| parent | 29614bf3790b6678fa074b57e210d7d629512ed3 (diff) | |
| parent | e6f59296a3e89276a3c9511ec61023d0f54c27e3 (diff) | |
Merge branch 'hotfix/0.8.0.1' into wdtk
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(/ /) |