ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-23 06:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'supported_ruby_changes'

Browse Source 
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
This commit is contained in:
Benjamin Fleischer 2015-12-14 14:24:11 -06:00
commit 1301b52696
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -3,10 +3,9 @@ language: ruby
sudo: false sudo: false
rvm: rvm:
- 1.9.3
- 2.0.0 - 2.0.0
- 2.1 - 2.1
- 2.2.2 - 2.2.3
- ruby-head - ruby-head
- rbx-2 - rbx-2
@ -26,8 +25,6 @@ env:
matrix: matrix:
exclude: exclude:
- rvm: 1.9.3
env: RAILS_VERSION=master
- rvm: 2.0.0 - rvm: 2.0.0
env: RAILS_VERSION=master env: RAILS_VERSION=master
- rvm: 2.1 - rvm: 2.1

3
CHANGELOG.md
View File

@ -2,6 +2,8 @@
Breaking changes: 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) - [#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) - [#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. * Adapters now inherit Adapter::Base. 'Adapter' is now a module, no longer a class.
@ -42,6 +44,7 @@ Misc:
- [#1166](https://github.com/rails-api/active_model_serializers/pull/1166) Prefer methods over instance variables (@bf4) - [#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) - [#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) - [#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) ### 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) - [#1129](https://github.com/rails-api/active_model_serializers/pull/1129) Remove SerializableResource.serialize in favor of `.new` (@bf4)

2
active_model_serializers.gemspec
View File

@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib'] spec.require_paths = ['lib']
spec.required_ruby_version = '>= 1.9.3' spec.required_ruby_version = '>= 2.0.0'
rails_versions = '>= 4.0' rails_versions = '>= 4.0'
spec.add_runtime_dependency 'activemodel', rails_versions spec.add_runtime_dependency 'activemodel', rails_versions