From 43f5ab93e016ced1592046229b82c28b2dae4556 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 31 Dec 2004 16:38:24 +0000 Subject: Fixed that generated action_mailers doesnt need to require the action_mailer since thats already done in the environment #382 [Lucas Carlson] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@287 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/CHANGELOG | 2 ++ railties/generators/mailer/templates/mailer.rb | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/railties/CHANGELOG b/railties/CHANGELOG index cf67e69880..ada723b0fa 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that generated action_mailers doesnt need to require the action_mailer since thats already done in the environment #382 [Lucas Carlson] + * Fixed dependency management to happen in a unified fashion for Active Record and Action Pack using the new Dependencies module. This means that the environment options needs to change from: diff --git a/railties/generators/mailer/templates/mailer.rb b/railties/generators/mailer/templates/mailer.rb index d6e8d1691d..81c19fa76d 100644 --- a/railties/generators/mailer/templates/mailer.rb +++ b/railties/generators/mailer/templates/mailer.rb @@ -1,5 +1,3 @@ -require 'action_mailer' - class <%= class_name %> < ActionMailer::Base <% for action in actions -%> -- cgit v1.2.3