Skip to content

Commit 383a380

Browse files
authored
Merge branch '0-10-stable' into 0-10-stable
2 parents 1ba079c + 6d651bc commit 383a380

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 0.10.x
22

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

55
Breaking changes:
66

@@ -10,6 +10,12 @@ Fixes:
1010

1111
Misc:
1212

13+
### [v0.10.12 (2020-12-10)](https://github.com/rails-api/active_model_serializers/compare/v0.10.11...v0.10.12)
14+
15+
Fixes:
16+
17+
- [#2398](https://github.com/rails-api/active_model_serializers/pull/2398) Update rails dependency to < 6.2 (@ritikesh)
18+
1319
### [v0.10.11 (2020-12-04)](https://github.com/rails-api/active_model_serializers/compare/v0.10.10...v0.10.11)
1420

1521
Features:

active_model_serializers.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
2121

2222
spec.required_ruby_version = '>= 2.1'
2323

24-
rails_versions = ['>= 4.1', '< 6.1']
24+
rails_versions = ['>= 4.1', '< 6.2']
2525
spec.add_runtime_dependency 'activemodel', rails_versions
2626
# 'activesupport', rails_versions
2727
# 'builder'

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.11'.freeze
5+
VERSION = '0.10.12'.freeze
66
end
77
end

0 commit comments

Comments
 (0)