aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/action_cable/channel/base.rb4
-rw-r--r--lib/action_cable/server.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/action_cable/channel/base.rb b/lib/action_cable/channel/base.rb
index 82c1a14b49..e091d08c9c 100644
--- a/lib/action_cable/channel/base.rb
+++ b/lib/action_cable/channel/base.rb
@@ -45,8 +45,8 @@ module ActionCable
# Override in subclasses
end
- def publish(data)
- @connection.publish(data.merge(identifier: @channel_identifier).to_json)
+ def broadcast(data)
+ @connection.broadcast(data.merge(identifier: @channel_identifier).to_json)
end
def start_periodic_timers
diff --git a/lib/action_cable/server.rb b/lib/action_cable/server.rb
index 2d80e96265..a55c3be3bc 100644
--- a/lib/action_cable/server.rb
+++ b/lib/action_cable/server.rb
@@ -38,7 +38,7 @@ module ActionCable
end
end
- def publish(data)
+ def broadcast(data)
render data
end