diff options
| author | José Valim <jose.valim@gmail.com> | 2012-03-14 01:12:50 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-03-14 01:12:50 -0700 |
| commit | 29094c07884d1efe26a70bd586ddbc5bad995649 (patch) | |
| tree | 9ce6e410e799e133de74d93e8e95507166ab9610 /actionmailer/lib/rails/generators/mailer/templates/mailer.rb | |
| parent | ec22a2b81356511b7613fcd41b693035a3cf5040 (diff) | |
| parent | 1ced5ca67bc553ebc4a8a1b3ba4776e882587600 (diff) | |
| download | rails-29094c07884d1efe26a70bd586ddbc5bad995649.tar.gz rails-29094c07884d1efe26a70bd586ddbc5bad995649.tar.bz2 rails-29094c07884d1efe26a70bd586ddbc5bad995649.zip | |
Merge pull request #5425 from rafaelfranca/remove_key_value
Remove key_value helper now that master is 1.9 only and we always use the 1.9 hash syntax in the generators.
Diffstat (limited to 'actionmailer/lib/rails/generators/mailer/templates/mailer.rb')
| -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 aaa1f79732..f6ed7cf8ac 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 <%= key_value :from, '"from@example.com"' %> + default from: "from@example.com" <% actions.each do |action| -%> # 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 <%= key_value :to, '"to@example.org"' %> + mail to: "to@example.org" end <% end -%> end |