Skip to content

Commit ffca2b8

Browse files
committed
Merge pull request #21 from wildcardlabs/active-model-serializer-rc4
bump active model serializers to rc4
2 parents 5f82bd6 + 918f69a commit ffca2b8

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

app/serializers/spree/image_serializer.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ class ImageSerializer < Spree::BaseSerializer
44

55
belongs_to :viewable
66

7-
private
8-
97
def links
108
image_links object.attachment
119
end

app/serializers/spree/taxon_serializer.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ class TaxonSerializer < Spree::BaseSerializer
77
belongs_to :parent, serializer: TaxonSerializer
88
has_many :children, serializer: TaxonSerializer
99

10-
private
11-
1210
def links
1311
image_links object.icon
1412
end

solidus_json_api.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
1717
s.requirements << 'none'
1818

1919
s.add_dependency 'solidus_api', '~> 1.0'
20-
s.add_dependency 'active_model_serializers', '= 0.10.0.rc2'
20+
s.add_dependency 'active_model_serializers', '= 0.10.0.rc4'
2121

2222
s.add_development_dependency 'coffee-rails'
2323
s.add_development_dependency 'coveralls'

0 commit comments

Comments
 (0)