Merge pull request #1769 from remear/upgrade-rubocop

Upgrade to rubocop ~> 0.40.0
This commit is contained in:
Yohan Robert 2016-06-01 19:51:10 +02:00
commit 44128a5d23
2 changed files with 3 additions and 2 deletions

View File

@ -48,6 +48,6 @@ group :test do
end
group :development, :test do
gem 'rubocop', '~> 0.39.0', require: false
gem 'rubocop', '~> 0.40.0', require: false
gem 'yard', require: false
end

View File

@ -431,7 +431,8 @@ module ActiveModelSerializers
def relationships_for(serializer, requested_associations)
include_directive = JSONAPI::IncludeDirective.new(
requested_associations,
allow_wildcard: true)
allow_wildcard: true
)
serializer.associations(include_directive).each_with_object({}) do |association, hash|
hash[association.key] = Relationship.new(
serializer,