Skip to content

Commit 1ba079c

Browse files
authored
Merge branch '0-10-stable' into 0-10-stable
2 parents df9b7a8 + bc08284 commit 1ba079c

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

CHANGELOG.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
## 0.10.x
22

3-
### [master (unreleased)](https://github.com/rails-api/active_model_serializers/compare/v0.10.10...0-10-stable)
3+
### [master (unreleased)](https://github.com/rails-api/active_model_serializers/compare/v0.10.11...0-10-stable)
44

55
Breaking changes:
66

77
Features:
88

9+
Fixes:
10+
11+
Misc:
12+
13+
### [v0.10.11 (2020-12-04)](https://github.com/rails-api/active_model_serializers/compare/v0.10.10...v0.10.11)
14+
15+
Features:
16+
917
- [#2361](https://github.com/rails-api/active_model_serializers/pull/2361) Add `ActiveModelSerializers.config.use_sha1_digests` to allow customization of the hashing algorithm used for serializer caching (@alexzherdev)
1018

1119
Fixes:
1220

1321
- [#2344](https://github.com/rails-api/active_model_serializers/pull/2344) Fixes #2341 introduced since #2223 (@wasifhossain)
14-
15-
Misc:
22+
- [#2395](https://github.com/rails-api/active_model_serializers/pull/2395) remove explicit require for thread_safe (@ritikesh)
1623

1724
### [v0.10.10 (2019-07-13)](https://github.com/rails-api/active_model_serializers/compare/v0.10.9...v0.10.10)
1825

active_model_serializers.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ Gem::Specification.new do |spec|
5454
spec.add_development_dependency 'kaminari', ' ~> 0.16.3'
5555
spec.add_development_dependency 'will_paginate', '~> 3.0', '>= 3.0.7'
5656

57-
spec.add_development_dependency 'bundler', '~> 1.6'
58-
spec.add_development_dependency 'simplecov', '~> 0.11'
57+
spec.add_development_dependency 'bundler'
58+
spec.add_development_dependency 'simplecov', '>= 0.11'
5959
spec.add_development_dependency 'timecop', '~> 0.7'
6060
spec.add_development_dependency 'grape', ['>= 0.13', '< 0.19.1']
6161
spec.add_development_dependency 'json_schema'

lib/active_model/serializer/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
module ActiveModel
44
class Serializer
5-
VERSION = '0.10.10'.freeze
5+
VERSION = '0.10.11'.freeze
66
end
77
end

0 commit comments

Comments
 (0)