From 0f38002517867a1054478e700c30651576b99a34 Mon Sep 17 00:00:00 2001 From: Jacob Bullock Date: Thu, 24 May 2018 10:41:04 -0700 Subject: [PATCH 1/2] hiding intellij settings --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 42303d4bb..92698dd8f 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,6 @@ tags Icon? ehthumbs.db Thumbs.db + +# sdk +.idea \ No newline at end of file From a113a0e64adfbe0ebd4e2494e970c99b926a006f Mon Sep 17 00:00:00 2001 From: Jacob Bullock Date: Thu, 24 May 2018 10:42:09 -0700 Subject: [PATCH 2/2] add optional parameter to relationships so they are only included if requested --- lib/active_model/serializer.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb index b5b95736c..2ecfd48ca 100644 --- a/lib/active_model/serializer.rb +++ b/lib/active_model/serializer.rb @@ -343,6 +343,7 @@ def associations(include_directive = ActiveModelSerializers.default_include_dire Enumerator.new do |y| self.class._reflections.each do |key, reflection| next if reflection.excluded?(self) + next if reflection.options[:optional] && ( instance_options[:included].nil? || !instance_options[:included].include?(key.to_s) ) next unless include_directive.key?(key) association = reflection.build_association(self, instance_options, include_slice)