aboutsummaryrefslogtreecommitdiffstats
path: root/config/application.rb
diff options
context:
space:
mode:
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 2356148a1..6b7d1b976 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -77,6 +77,12 @@ module Alaveteli
require "#{Rails.root}/lib/whatdotheyknow/strip_empty_sessions"
config.middleware.insert_before ::ActionDispatch::Cookies, WhatDoTheyKnow::StripEmptySessions, :key => '_wdtk_cookie_session', :path => "/", :httponly => true
+ # Allow the generation of full URLs in emails
+ config.action_mailer.default_url_options = { :host => AlaveteliConfiguration::domain }
+ if AlaveteliConfiguration::force_ssl
+ config.action_mailer.default_url_options[:protocol] = "https"
+ end
+
# Enable the asset pipeline
config.assets.enabled = true
@@ -94,6 +100,7 @@ module Alaveteli
# ... while these are individual files that can't easily be
# grouped:
config.assets.precompile += ['jquery.fancybox-1.3.4.pack.js',
+ 'jquery.fancybox-1.3.4.css',
'jquery.Jcrop.css',
'excanvas.min.js',
'select-authorities.js',