diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-07-22 18:12:01 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-07-22 18:12:01 -0700 |
| commit | 0aa6872dc55fcffb892ef066f869b6f9046b6943 (patch) | |
| tree | 94a4af9ffdbfb0b7beb26065f55dd0f6bb357599 /activerecord/lib/active_record | |
| parent | 7085aae9019f5b6bab242471fe3c1be2997423ed (diff) | |
| download | rails-0aa6872dc55fcffb892ef066f869b6f9046b6943.tar.gz rails-0aa6872dc55fcffb892ef066f869b6f9046b6943.tar.bz2 rails-0aa6872dc55fcffb892ef066f869b6f9046b6943.zip | |
only flatten one side
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |