Skip to content
Snippets Groups Projects
Commit 88185655 authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub
Browse files

Fix #4894 - Merge context hash into final JSON hash after key transform (#4898)

parent 0a6b0986
No related branches found
Tags v1.2
No related merge requests found
......@@ -28,7 +28,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
def serializable_hash(options = nil)
options = serialization_options(options)
serialized_hash = CONTEXT.merge(ActiveModelSerializers::Adapter::Attributes.new(serializer, instance_options).serializable_hash(options))
self.class.transform_key_casing!(serialized_hash, instance_options)
serialized_hash = ActiveModelSerializers::Adapter::Attributes.new(serializer, instance_options).serializable_hash(options)
CONTEXT.merge(self.class.transform_key_casing!(serialized_hash, instance_options))
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment