diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-01-19 22:11:17 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-01-19 22:11:17 +0530 |
| commit | 2c7ded31fb89c924bcb3a1b5f57d5c0f5b675ef1 (patch) | |
| tree | ec5eead51cd438996d34b8f0fe762a18b28d506e | |
| parent | e95e932fbe38617b72f21fde6cac53f49473d881 (diff) | |
| parent | ad3a129380499035174b9a6c8df7cc6df2471f38 (diff) | |
| download | rails-2c7ded31fb89c924bcb3a1b5f57d5c0f5b675ef1.tar.gz rails-2c7ded31fb89c924bcb3a1b5f57d5c0f5b675ef1.tar.bz2 rails-2c7ded31fb89c924bcb3a1b5f57d5c0f5b675ef1.zip | |
Merge branch 'master' of github.com:lifo/docrails
| -rw-r--r-- | actionpack/lib/action_view/helpers/url_helper.rb | 2 | ||||
| -rw-r--r-- | railties/guides/source/3_2_release_notes.textile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 56f999f2f5..d27d49821b 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -473,7 +473,7 @@ module ActionView # string given as the value. # * <tt>:subject</tt> - Preset the subject line of the email. # * <tt>:body</tt> - Preset the body of the email. - # * <tt>:cc</tt> - Carbon Copy addition recipients on the email. + # * <tt>:cc</tt> - Carbon Copy additional recipients on the email. # * <tt>:bcc</tt> - Blind Carbon Copy additional recipients on the email. # # ==== Examples diff --git a/railties/guides/source/3_2_release_notes.textile b/railties/guides/source/3_2_release_notes.textile index 8b242df179..379b7472c6 100644 --- a/railties/guides/source/3_2_release_notes.textile +++ b/railties/guides/source/3_2_release_notes.textile @@ -298,6 +298,8 @@ h3. Active Record * Boolean columns with 'on' and 'ON' values are type casted to true. +* When the +timestamps+ method creates the +created_at+ and +updated_at+ columns, it makes them non-nullable by default. + * Implemented <tt>ActiveRecord::Relation#explain</tt>. * Implements <tt>AR::Base.silence_auto_explain</tt> which allows the user to selectively disable automatic EXPLAINs within a block. |