aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-07 14:20:31 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-07 15:31:50 +0100
commitf564f947d94645dca8ff67fc5c2ad161eb2bb187 (patch)
treeb5ac8c835de8ded49bd5887c3dacb538acf8efad /actionmailer/lib/action_mailer
parent598456b68b48446159c37ced52c4092c29d31ac6 (diff)
downloadrails-f564f947d94645dca8ff67fc5c2ad161eb2bb187.tar.gz
rails-f564f947d94645dca8ff67fc5c2ad161eb2bb187.tar.bz2
rails-f564f947d94645dca8ff67fc5c2ad161eb2bb187.zip
Remove duplicated url_for code and move methods shared between ActionMailer and ActionController up to AbstractController.
Diffstat (limited to 'actionmailer/lib/action_mailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index c2ffa5a0e9..e644c47e9c 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -259,10 +259,9 @@ module ActionMailer #:nodoc:
include AbstractController::LocalizedCache
include AbstractController::Layouts
include AbstractController::Helpers
+ include AbstractController::UrlFor
helper ActionMailer::MailHelper
-
- include ActionController::UrlWriter
include ActionMailer::DeprecatedBody
private_class_method :new #:nodoc: