diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-31 16:38:24 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-31 16:38:24 +0000 |
| commit | 43f5ab93e016ced1592046229b82c28b2dae4556 (patch) | |
| tree | b9bf03818b96a670066dd4e6bfd0d4cb00b3ccb5 | |
| parent | 13273f7a55576825bbcc21605e3cb0121ae83c0b (diff) | |
| download | rails-43f5ab93e016ced1592046229b82c28b2dae4556.tar.gz rails-43f5ab93e016ced1592046229b82c28b2dae4556.tar.bz2 rails-43f5ab93e016ced1592046229b82c28b2dae4556.zip | |
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
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | 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 -%> |