Merge commit 'mainstream/master'

Conflicts:

	railties/configs/initializers/new_rails_defaults.rb

2 files changed, 3 insertions, 3 deletions

diff --git a/railties/configs/initializers/new_rails_defaults.rb b/railties/configs/initializers/new_rails_defaults.rb
index 2d7889ef22..5e60c0ade4 100644
--- a/railties/configs/initializers/new_rails_defaults.rb
+++ b/railties/configs/initializers/new_rails_defaults.rb
@@ -1,9 +1,6 @@
 # These settings change the behavior of Rails 2 apps and will be defaults
 # for Rails 3. You can remove this initializer when Rails 3 is released.
 
-# Only save the attributes that have changed since the record was loaded.
-ActiveRecord::Base.partial_updates = true
-
 # Include Active Record class name as root for JSON serialized output.
 ActiveRecord::Base.include_root_in_json = true
 
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index 2086c609af..468fa45ef6 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -64,4 +64,7 @@ Rails::Initializer.run do |config|
 
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector
+
+  # Make ActiveRecord only save the attributes that have changed since the record was loaded.
+  # config.active_record.partial_updates = true
 end
\ No newline at end of file