From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 2 Feb 2017 15:57:09 +0000 (+0100)
Subject: Fix bug
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=889b814385b55785cec98de4dd26f2986e705052;p=mastodon.git

Fix bug
---

diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
index f57bcc56a..344511cae 100644
--- a/app/channels/application_cable/channel.rb
+++ b/app/channels/application_cable/channel.rb
@@ -5,11 +5,11 @@ module ApplicationCable
     protected
 
     def hydrate_status(encoded_message)
-      message = OJ.load(encoded_message)
+      message = Oj.load(encoded_message)
 
       return [nil, message] if message['event'] == 'delete'
 
-      status_json = OJ.load(message['payload'])
+      status_json = Oj.load(message['payload'])
       status      = Status.find(status_json['id'])
 
       [status, message]