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

Merge branch 'andreaseger-fix_missing_require_of_active_support_json'

Browse Source
This commit is contained in:
Benjamin Fleischer 2016-04-04 13:52:16 -05:00
commit b58f73ced1
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -41,6 +41,7 @@ Features:
- [#1340](https://github.com/rails-api/active_model_serializers/pull/1340) Add support for resource-level meta. (@beauby) - [#1340](https://github.com/rails-api/active_model_serializers/pull/1340) Add support for resource-level meta. (@beauby)
Fixes: Fixes:
- [#1657](https://github.com/rails-api/active_model_serializers/pull/1657) Add missing missing require "active_support/json". (@andreaseger)
- [#1661](https://github.com/rails-api/active_model_serializers/pull/1661) Fixes `read_attribute_for_serialization` not - [#1661](https://github.com/rails-api/active_model_serializers/pull/1661) Fixes `read_attribute_for_serialization` not
seeing methods defined in serialization superclass (#1653, #1658, #1660), introduced in #1650. (@bf4) seeing methods defined in serialization superclass (#1653, #1658, #1660), introduced in #1650. (@bf4)
- [#1651](https://github.com/rails-api/active_model_serializers/pull/1651) Fix deserialization of nil relationships. (@NullVoxPopuli) - [#1651](https://github.com/rails-api/active_model_serializers/pull/1651) Fix deserialization of nil relationships. (@NullVoxPopuli)

1
lib/active_model_serializers.rb
View File

@ -2,6 +2,7 @@ require 'active_model'
require 'active_support' require 'active_support'
require 'active_support/core_ext/object/with_options' require 'active_support/core_ext/object/with_options'
require 'active_support/core_ext/string/inflections' require 'active_support/core_ext/string/inflections'
require 'active_support/json'
module ActiveModelSerializers module ActiveModelSerializers
extend ActiveSupport::Autoload extend ActiveSupport::Autoload
autoload :Model autoload :Model

1
test/test_helper.rb
View File

@ -14,7 +14,6 @@ require 'rails'
require 'action_controller' require 'action_controller'
require 'action_controller/test_case' require 'action_controller/test_case'
require 'action_controller/railtie' require 'action_controller/railtie'
require 'active_support/json'
require 'active_model_serializers' require 'active_model_serializers'
require 'fileutils' require 'fileutils'
FileUtils.mkdir_p(File.expand_path('../../tmp/cache', __FILE__)) FileUtils.mkdir_p(File.expand_path('../../tmp/cache', __FILE__))