queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Eugen Rochko 2017-09-12 00:16:18 +02:00 committed by GitHub
parent 0a6b098668
commit 881856553e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/lib/activitypub/adapter.rb
View file

@ -28,7 +28,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
def serializable_hash(options = nil) def serializable_hash(options = nil)
options = serialization_options(options) options = serialization_options(options)
serialized_hash = CONTEXT.merge(ActiveModelSerializers::Adapter::Attributes.new(serializer, instance_options).serializable_hash(options)) serialized_hash = ActiveModelSerializers::Adapter::Attributes.new(serializer, instance_options).serializable_hash(options)
self.class.transform_key_casing!(serialized_hash, instance_options) CONTEXT.merge(self.class.transform_key_casing!(serialized_hash, instance_options))
end end
end end