about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authornicobz25 <nico@alias-serveur.com>2017-04-05 13:48:31 +0200
committerGitHub <noreply@github.com>2017-04-05 13:48:31 +0200
commit6201fba2d3bcb38d2728b0f21a98fbd4c3b9205a (patch)
tree493580d1216ac32f9db414ff9cf2567ae56d0c25 /app
parent9572282a559a07196e62190a852aacbd94968c71 (diff)
parentcfe91ac984fcabcc1980e88367dd636f0a8cc799 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'app')
-rw-r--r--app/lib/feed_manager.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 2cca1cefe..88f6f4a46 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -39,7 +39,7 @@ class FeedManager
 
   def broadcast(timeline_id, options = {})
     options[:queued_at] = (Time.now.to_f * 1000.0).to_i
-    ActionCable.server.broadcast("timeline:#{timeline_id}", options)
+    redis.publish("timeline:#{timeline_id}", Oj.dump(options))
   end
 
   def trim(type, account_id)