aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-03-14 10:41:02 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-03-14 10:41:02 -0300
commit13cdb5fb49e08945855bd7196d5520cf2a885c5c (patch)
tree8176c48ff2dd16630bd47218487229c8ea2022f9 /activerecord
parent3560d7aad7c9bffc903ec1378c1c1d7c738f5b86 (diff)
downloadrails-13cdb5fb49e08945855bd7196d5520cf2a885c5c.tar.gz
rails-13cdb5fb49e08945855bd7196d5520cf2a885c5c.tar.bz2
rails-13cdb5fb49e08945855bd7196d5520cf2a885c5c.zip
Avoid duplicated conditionals
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations/collection_association.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index ff0fbe932b..1f314e0677 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -145,9 +145,8 @@ module ActiveRecord
# be chained. Since << flattens its argument list and inserts each record,
# +push+ and +concat+ behave identically.
def concat(*records)
- load_target if owner.new_record?
-
if owner.new_record?
+ load_target
concat_records(records)
else
transaction { concat_records(records) }