diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-13 15:29:36 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-13 15:29:36 -0700 |
| commit | 0307fc70add3337a9371ab40d7635372511a8f17 (patch) | |
| tree | 3b18f502faa772a3191898c9b5618441727ed752 /actionmailer | |
| parent | a4a338167e752a4d92c64c7133ff4c975155ab7b (diff) | |
| parent | f2769ebd7eaa4bdc9aabfbff23c1ef3cbc7d4f9f (diff) | |
| download | rails-0307fc70add3337a9371ab40d7635372511a8f17.tar.gz rails-0307fc70add3337a9371ab40d7635372511a8f17.tar.bz2 rails-0307fc70add3337a9371ab40d7635372511a8f17.zip | |
Merge pull request #540 from sikachu/mailer_generator_1_9_style
Update Mailer generator to use 1.9 styled hash when run on Ruby 1.9
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/rails/generators/mailer/templates/mailer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb index 370a508cad..88b074cef5 100644 --- a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb +++ b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb @@ -1,6 +1,6 @@ <% module_namespacing do -%> class <%= class_name %> < ActionMailer::Base - default :from => "from@example.com" + default <%= key_value :from, '"from@example.com"' %> <% for action in actions -%> # Subject can be set in your I18n file at config/locales/en.yml @@ -11,7 +11,7 @@ class <%= class_name %> < ActionMailer::Base def <%= action %> @greeting = "Hi" - mail :to => "to@example.org" + mail <%= key_value :to, '"to@example.org"' %> end <% end -%> end |