Skip to content

Commit

Permalink
Merge branch 'supported_ruby_changes'
Browse files Browse the repository at this point in the history
Closes #1360, #1369

- @KaraAJC updated CI Ruby from 2.2.2 to 2.2.3
- @KaraAJC updated CI Ruby to remove Ruby 1.9.3
- @maurogeorge updated gemspec to require Ruby >= 2.0.0
  • Loading branch information
bf4 committed Dec 14, 2015
2 parents f562449 + 60ac749 commit 1301b52
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ language: ruby
sudo: false

rvm:
- 1.9.3
- 2.0.0
- 2.1
- 2.2.2
- 2.2.3
- ruby-head
- rbx-2

Expand All @@ -26,8 +25,6 @@ env:

matrix:
exclude:
- rvm: 1.9.3
env: RAILS_VERSION=master
- rvm: 2.0.0
env: RAILS_VERSION=master
- rvm: 2.1
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

Breaking changes:

- [#1360](https://github.com/rails-api/active_model_serializers/pull/1360)
[#1369](https://github.com/rails-api/active_model_serializers/pull/1369) Drop support for Ruby 1.9.3 (@karaAJC, @maurogeorge)
- [#1131](https://github.com/rails-api/active_model_serializers/pull/1131) Remove Serializer#root_name (@beauby)
- [#1138](https://github.com/rails-api/active_model_serializers/pull/1138) Introduce Adapter::Base (@bf4)
* Adapters now inherit Adapter::Base. 'Adapter' is now a module, no longer a class.
Expand Down Expand Up @@ -42,6 +44,7 @@ Misc:
- [#1166](https://github.com/rails-api/active_model_serializers/pull/1166) Prefer methods over instance variables (@bf4)
- [#1168](https://github.com/rails-api/active_model_serializers/pull/1168) Fix appveyor failure cache not being expired (@bf4)
- [#1161](https://github.com/rails-api/active_model_serializers/pull/1161) Remove duplicate test helper (@bf4)
- [#1360](https://github.com/rails-api/active_model_serializers/pull/1360) Update CI to test 2.2.2 -> 2.2.3 (@karaAJC)

### v0.10.0.rc3 (2015/09/16 15:19 +00:00)
- [#1129](https://github.com/rails-api/active_model_serializers/pull/1129) Remove SerializableResource.serialize in favor of `.new` (@bf4)
Expand Down
2 changes: 1 addition & 1 deletion active_model_serializers.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib']

spec.required_ruby_version = '>= 1.9.3'
spec.required_ruby_version = '>= 2.0.0'

rails_versions = '>= 4.0'
spec.add_runtime_dependency 'activemodel', rails_versions
Expand Down

0 comments on commit 1301b52

Please sign in to comment.