diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-26 16:00:57 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-26 16:00:57 +0100 |
| commit | 1078677575b44ff2700cb6232b50d9c887e73c2b (patch) | |
| tree | 47963e11e0eade3d92383b80b04783adae7d5275 /railties/lib | |
| parent | d7de1c76cad28f52fc62693d415a07abf6c86ef5 (diff) | |
| parent | 05c4ad9d3f6ff8d0017f4bca9b52e552629c4813 (diff) | |
| download | rails-1078677575b44ff2700cb6232b50d9c887e73c2b.tar.gz rails-1078677575b44ff2700cb6232b50d9c887e73c2b.tar.bz2 rails-1078677575b44ff2700cb6232b50d9c887e73c2b.zip | |
Merge remote branch 'mikel/master'
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/generators/rails/mailer/templates/mailer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/generators/rails/mailer/templates/mailer.rb b/railties/lib/generators/rails/mailer/templates/mailer.rb index 1685b73633..cdc6e41266 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 - delivers_from "from@example.com" + self.defaults :from => "from@example.com" <% for action in actions -%> # Subject can be set in your I18n file at config/locales/en.yml @@ -9,7 +9,7 @@ class <%= class_name %> < ActionMailer::Base # def <%= action %> @greeting = "Hi" - mail(:to => "to@example.com") + mail(:to => "to@example.org") end <% end -%> end
\ No newline at end of file |