From 4f3b8e107ab77848d7982b6a2bde87f4b015a98f Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Fri, 8 Oct 2010 12:26:27 -0300
Subject: IdentityMap is enabled by default.

---
 activerecord/lib/active_record/identity_map.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb
index 94eece9132..d605bde5b2 100644
--- a/activerecord/lib/active_record/identity_map.rb
+++ b/activerecord/lib/active_record/identity_map.rb
@@ -9,9 +9,11 @@ module ActiveRecord
   #
   # == Configuration
   #
-  # In order to activate IdentityMap, set <tt>config.active_record.identity_map = true</tt>
+  # In order to disable IdentityMap, set <tt>config.active_record.identity_map = false</tt>
   # in your <tt>config/application.rb</tt> file.
   #
+  # IdentityMap is enabled by default.
+  #
   module IdentityMap
     extend ActiveSupport::Concern
 
@@ -63,7 +65,7 @@ module ActiveRecord
 
     self.repositories ||= Hash.new
     self.current_repository_name ||= :default
-    self.enabled = false
+    self.enabled = true
 
     module InstanceMethods
       # Reinitialize an Identity Map model object from +coder+.
-- 
cgit v1.2.3