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

Remove non-ci changes from 2373

Browse Source
This commit is contained in:
Benjamin Fleischer 2020-02-13 21:17:25 -06:00
parent 575231503d
commit 1a7528884c
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,8 +2,6 @@
### [0-9-stable](https://github.com/rails-api/active_model_serializers/compare/v0.9.7...0-9-stable)
- [#2373](https://github.com/rails-api/active_model_serializers/pull/2373) Fix Rails 6.0 deprecation warnings. (@supremebeing7)
### [v0.9.7 (2017-05-01)](https://github.com/rails-api/active_model_serializers/compare/v0.9.6...v0.9.7)
- [#2080](https://github.com/rails-api/active_model_serializers/pull/2080) remove `{ payload: nil }` from `!serialize.active_model_serializers` ActiveSupport::Notification. `payload` never had a value. Changes, for example `{ serializer: 'ActiveModel::DefaultSerializer', payload: nil }` to be `{ serializer: 'ActiveModel::DefaultSerializer' }` (@yosiat)

10
lib/action_controller/serialization.rb
View File

@ -60,15 +60,7 @@ module ActionController
private
def namespace_for_serializer
@namespace_for_serializer ||= namespace_for_class(self.class) unless namespace_for_class(self.class) == Object
end
def namespace_for_class(klass)
if Module.method_defined?(:module_parent)
klass.module_parent
else
klass.parent
end
@namespace_for_serializer ||= self.class.parent unless self.class.parent == Object
end
def default_serializer(resource)