aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorOscar Del Ben <info@oscardelben.com>2012-04-30 11:28:15 +0200
committerOscar Del Ben <info@oscardelben.com>2012-04-30 11:28:15 +0200
commit4eb482efbcb36086bb268fb4e97d1bbd1f7fbd09 (patch)
tree0b85dcc3d133913c1386687989a21b929919349d /guides/source
parent06a1519a4dc714822bec2312a41950aedba82541 (diff)
parent14cd5aa8da122a132f94c73ae97b7a03c0ddec2b (diff)
downloadrails-4eb482efbcb36086bb268fb4e97d1bbd1f7fbd09.tar.gz
rails-4eb482efbcb36086bb268fb4e97d1bbd1f7fbd09.tar.bz2
rails-4eb482efbcb36086bb268fb4e97d1bbd1f7fbd09.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/upgrading_ruby_on_rails.textile4
1 files changed, 4 insertions, 0 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.textile b/guides/source/upgrading_ruby_on_rails.textile
index e63548abc9..2b2e65c813 100644
--- a/guides/source/upgrading_ruby_on_rails.textile
+++ b/guides/source/upgrading_ruby_on_rails.textile
@@ -38,6 +38,10 @@ h4(#identity_map4_0). IdentityMap
Rails 4.0 has removed <tt>IdentityMap</tt> from <tt>ActiveRecord</tt>, due to "some inconsistencies with associations":https://github.com/rails/rails/commit/302c912bf6bcd0fa200d964ec2dc4a44abe328a6. If you have manually enabled it in your application, you will have to remove the following config that has no effect anymore: <tt>config.active_record.identity_map</tt>.
+h4(#active_model4_0). ActiveModel
+
+Rails 4.0 has changed how errors attach with the ConfirmationValidator. Now when confirmation validations fail the error will be attached to <tt>:#{attribute}_confirmation</tt> instead of <tt>attribute</tt>.
+
h3. Upgrading from Rails 3.1 to Rails 3.2
If your application is currently on any version of Rails older than 3.1.x, you should upgrade to Rails 3.1 before attempting an update to Rails 3.2.