From 1bb0605dfe09f654d9ad43a86b69183cd6f653f2 Mon Sep 17 00:00:00 2001 From: Mike Mangino Date: Fri, 3 Mar 2017 15:02:35 -0500 Subject: Don't accidentally lose includes in serialization --- activemodel/lib/active_model/serialization.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activemodel/lib/active_model') diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index 77834f26fc..78e46c49eb 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -177,7 +177,7 @@ module ActiveModel return unless includes = options[:include] unless includes.is_a?(Hash) - includes = Hash[Array(includes).map { |n| n.is_a?(Hash) ? n.to_a.first : [n, {}] }] + includes = Hash[Array(includes).flat_map { |n| n.is_a?(Hash) ? n.to_a : [[n, {}]] }] end includes.each do |association, opts| -- cgit v1.2.3