diff options
| author | Dmitry Polushkin <dmitry.polushkin@gmail.com> | 2011-09-15 09:39:26 +0100 |
|---|---|---|
| committer | Dmitry Polushkin <dmitry.polushkin@gmail.com> | 2011-09-15 09:39:26 +0100 |
| commit | 9d54f8994d09db5435d6c234430ae13333928fb9 (patch) | |
| tree | 12413c10ed50c181f5bea0980edca998e72969bb /railties/guides/source/action_mailer_basics.textile | |
| parent | edd2f21e8095fe4a38e812025b4d9fd0e0cc28f1 (diff) | |
| parent | da7f0426ec7b0aa053489633c2a8a3da6423654f (diff) | |
| download | rails-9d54f8994d09db5435d6c234430ae13333928fb9.tar.gz rails-9d54f8994d09db5435d6c234430ae13333928fb9.tar.bz2 rails-9d54f8994d09db5435d6c234430ae13333928fb9.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/guides/source/action_mailer_basics.textile')
| -rw-r--r-- | railties/guides/source/action_mailer_basics.textile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile index 67761645fa..ad5b848d2c 100644 --- a/railties/guides/source/action_mailer_basics.textile +++ b/railties/guides/source/action_mailer_basics.textile @@ -521,8 +521,3 @@ end </ruby> In the test we send the email and store the returned object in the +email+ variable. We then ensure that it was sent (the first assert), then, in the second batch of assertions, we ensure that the email does indeed contain what we expect. - -h3. Changelog - -* September 1, 2011: Changed the lines that said <tt>config/environments/env.rb</tt> to <tt>config/environments/$RAILS_ENV.rb</tt>. People were mis-interpreting the filename to literally be env.rb. "Andy Leeper":http://mochaleaf.com -* September 30, 2010: Fixed typos and reformatted Action Mailer configuration table for better understanding. "Jaime Iniesta":http://jaimeiniesta.com |