Skip to content

Commit

Permalink
Merge pull request rails-api#691 from jacob-s-son/fix-embed-option-fo…
Browse files Browse the repository at this point in the history
…r-associations

Fix embed option for associations
  • Loading branch information
kurko committed Oct 29, 2014
2 parents 6177566 + f9b7c74 commit baf3db1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/active_model/serializer/adapter/json_api.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def serializable_hash(options = {})

serializer.each_association do |name, association, opts|
@hash[@root][:links] ||= {}
unless options[:embed] == :ids
unless opts[:embed] == :ids
@hash[:linked] ||= {}
end

Expand Down
File renamed without changes.

0 comments on commit baf3db1

Please sign in to comment.