From 0aa6872dc55fcffb892ef066f869b6f9046b6943 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 22 Jul 2013 18:12:01 -0700 Subject: only flatten one side --- activerecord/lib/active_record/associations/builder/association.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index 07c7bf58f9..41126f6f00 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -66,7 +66,7 @@ module ActiveRecord::Associations::Builder end def valid_options - (Association.valid_options + Association.extensions.map(&:valid_options)).flatten + Association.valid_options + Association.extensions.map(&:valid_options).flatten end def validate_options -- cgit v1.2.3