diff --git a/railties/CHANGELOG b/railties/CHANGELOG index cf67e6988037058e7e3116256cba97353bb7e324..ada723b0fa14c3164b6c9348ca7cb01f9459f290 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 d6e8d1691df2c6c274913a89ec2baabecc969e8e..81c19fa76d10ffa660265114ec44923b09a03579 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 -%>