diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-09 13:15:59 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-09 13:15:59 -0700 |
| commit | c56f4b272d54bcca1978067a1fa8c78bdb3ab516 (patch) | |
| tree | fa2fb699c955ed3d7d98e5725894b3959dbec62b | |
| parent | 5b4849598a2cd3c9aaa3b73fcf14ec90fc56f879 (diff) | |
| parent | d9f95c76a43fc81d9c478c594fc847bc4adf0c75 (diff) | |
| download | rails-c56f4b272d54bcca1978067a1fa8c78bdb3ab516.tar.gz rails-c56f4b272d54bcca1978067a1fa8c78bdb3ab516.tar.bz2 rails-c56f4b272d54bcca1978067a1fa8c78bdb3ab516.zip | |
Merge pull request #471 from joshk/remove_as_concern
Removed an unneed AS::Concern from AR::IdentityMap
| -rw-r--r-- | activerecord/lib/active_record/identity_map.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb index f88ead9ca0..cad3865f03 100644 --- a/activerecord/lib/active_record/identity_map.rb +++ b/activerecord/lib/active_record/identity_map.rb @@ -15,7 +15,6 @@ module ActiveRecord # IdentityMap is disabled by default. # module IdentityMap - extend ActiveSupport::Concern class << self def enabled=(flag) @@ -53,7 +52,7 @@ module ActiveRecord if record.is_a?(klass) ActiveSupport::Notifications.instrument("identity.active_record", - :line => "From Identity Map (id: #{primary_key})", + :line => "From Identity Map (id: #{primary_key})", :name => "#{klass} Loaded", :connection_id => object_id) |