diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-08-20 09:37:13 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-08-20 09:37:13 +0100 |
commit | fccffdf4f70d5f9fa12ad6e75187be1728026823 (patch) | |
tree | 7d60b327cff1a2aa2f0d1ff5e5b3ed65791966b7 /lib/patch_mailer_paths.rb | |
parent | 550b1e66a97f34ae05f0ff425bd1dd768ed90ec2 (diff) | |
parent | f1f0e1762d368b074bc99ad0a344b33ddc4d33a8 (diff) |
Merge branch 'master' into develop
Diffstat (limited to 'lib/patch_mailer_paths.rb')
-rw-r--r-- | lib/patch_mailer_paths.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/patch_mailer_paths.rb b/lib/patch_mailer_paths.rb index d0a0b23..7a524fa 100644 --- a/lib/patch_mailer_paths.rb +++ b/lib/patch_mailer_paths.rb @@ -2,10 +2,9 @@ # and at startup in production - to patch existing app classes. # See http://stackoverflow.com/questions/7072758/plugin-not-reloading-in-development-mode # -require 'dispatcher' -Dispatcher.to_prepare do +Rails.configuration.to_prepare do # Override mailer templates with theme ones. Note doing this in a before_filter, # as we do with the controller paths, doesn't seem to have any effect when # running in production - ActionMailer::Base.view_paths.unshift File.join(File.dirname(__FILE__), "views") + ActionMailer::Base.prepend_view_path File.join(File.dirname(__FILE__), "views") end |