Skip to content

Commit 44128a5

Browse files
author
Yohan Robert
committed
Merge pull request #1769 from remear/upgrade-rubocop
Upgrade to rubocop ~> 0.40.0
2 parents f2f747e + d900b09 commit 44128a5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ group :test do
4848
end
4949

5050
group :development, :test do
51-
gem 'rubocop', '~> 0.39.0', require: false
51+
gem 'rubocop', '~> 0.40.0', require: false
5252
gem 'yard', require: false
5353
end

lib/active_model_serializers/adapter/json_api.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,8 @@ def resource_object_for(serializer)
431431
def relationships_for(serializer, requested_associations)
432432
include_directive = JSONAPI::IncludeDirective.new(
433433
requested_associations,
434-
allow_wildcard: true)
434+
allow_wildcard: true
435+
)
435436
serializer.associations(include_directive).each_with_object({}) do |association, hash|
436437
hash[association.key] = Relationship.new(
437438
serializer,

0 commit comments

Comments
 (0)