diff options
| author | Stefan Penner <stefan.penner@gmail.com> | 2010-01-27 22:44:56 -0600 |
|---|---|---|
| committer | Stefan Penner <stefan.penner@gmail.com> | 2010-01-27 22:44:56 -0600 |
| commit | 3aa1ea1ae4baa4a03d03644e798eeb98a4745785 (patch) | |
| tree | 199dab8c28aa5476373af32000159f38cda04cdc /railties/lib/generators/rails | |
| parent | 2ec99192d59e3f901b301d5735cee9a0b9ee091a (diff) | |
| parent | 2c12a71378d2146c822acb389b00b866f6420ff5 (diff) | |
| download | rails-3aa1ea1ae4baa4a03d03644e798eeb98a4745785.tar.gz rails-3aa1ea1ae4baa4a03d03644e798eeb98a4745785.tar.bz2 rails-3aa1ea1ae4baa4a03d03644e798eeb98a4745785.zip | |
Merge branch 'rails/master' into ujs
Diffstat (limited to 'railties/lib/generators/rails')
| -rw-r--r-- | railties/lib/generators/rails/mailer/templates/mailer.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/generators/rails/mailer/templates/mailer.rb b/railties/lib/generators/rails/mailer/templates/mailer.rb index cdc6e41266..7343eb28b3 100644 --- a/railties/lib/generators/rails/mailer/templates/mailer.rb +++ b/railties/lib/generators/rails/mailer/templates/mailer.rb @@ -1,5 +1,5 @@ class <%= class_name %> < ActionMailer::Base - self.defaults :from => "from@example.com" + default :from => "from@example.com" <% for action in actions -%> # Subject can be set in your I18n file at config/locales/en.yml @@ -9,7 +9,8 @@ class <%= class_name %> < ActionMailer::Base # def <%= action %> @greeting = "Hi" - mail(:to => "to@example.org") + + mail :to => "to@example.org" end <% end -%> -end
\ No newline at end of file +end |