Exclude 2.0 form 5.0; update deps

This commit is contained in:
Benjamin Fleischer
2017-03-12 16:14:29 -05:00
parent 1b89a4b4de
commit 02f2f864a4
4 changed files with 18 additions and 5 deletions

View File

@@ -203,7 +203,7 @@ end
if included_associations.include? name
association_serializer = build_serializer(association)
# we must do this always because even if the current association is not
# embeded in root, it might have its own associations that are embeded in root
# embedded in root, it might have its own associations that are embedded in root
hash.merge!(association_serializer.embedded_in_root_associations) do |key, oldval, newval|
if oldval.respond_to?(:to_ary)
[oldval, newval].flatten.uniq