From 3a156ec8e79b88ff90e8f5ed34dd05b89e94b72f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sun, 1 Mar 2015 16:35:13 -0800
Subject: remove useless conditional

`@reflects_state[depth+1]` will always be nil because we haven't made a
method call that would make it true yet.
---
 activerecord/lib/active_record/core.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index d41872d767..e1a72baff0 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -522,7 +522,7 @@ module ActiveRecord
           @reflects_state[depth] = true
         end
 
-        if transaction_state.parent && !@reflects_state[depth+1]
+        if transaction_state.parent
           update_attributes_from_transaction_state(transaction_state.parent, depth+1)
         end
       end
-- 
cgit v1.2.3