diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-04-02 10:02:27 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-02 10:02:27 +0100 |
| commit | 01aeaf8d950a2d558b0dc5722aa6d4cdcd20be17 (patch) | |
| tree | e944e14d61d179edd606d733309ea63b632749be /config/environment.rb | |
| parent | dc71db3f98c64fb93ac7d74b8a424f7849a33786 (diff) | |
| parent | e6f59296a3e89276a3c9511ec61023d0f54c27e3 (diff) | |
Merge branch 'hotfix/0.8.0.1' into develop
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(/ /) |