diff options
author | Xavier Noria <fxn@hashref.com> | 2016-08-07 11:48:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-07 11:48:29 +0200 |
commit | fb98d2e57162876c0e1823a5357bc44a932d08b9 (patch) | |
tree | 2c3225f7698ef3f7b2556510136c64a58ecf7355 /actioncable | |
parent | 0d12708f3967fe93c172b30bd3e98e4433761c36 (diff) | |
parent | 762e3f05f3d372cb32570db0deeef27232c4dd00 (diff) | |
download | rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.tar.gz rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.tar.bz2 rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.zip |
Merge pull request #26077 from kamipo/add_stype_empty_lines
Add `Style/EmptyLines` in `.rubocop.yml` and remove extra empty lines
Diffstat (limited to 'actioncable')
-rw-r--r-- | actioncable/lib/action_cable/channel/base.rb | 1 | ||||
-rw-r--r-- | actioncable/test/subscription_adapter/common.rb | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/actioncable/lib/action_cable/channel/base.rb b/actioncable/lib/action_cable/channel/base.rb index 1dda0e407f..8ab061171e 100644 --- a/actioncable/lib/action_cable/channel/base.rb +++ b/actioncable/lib/action_cable/channel/base.rb @@ -177,7 +177,6 @@ module ActionCable end end - protected # Called once a consumer has become a subscriber of the channel. Usually the place to setup any streams # you want this channel to be sending to the subscriber. diff --git a/actioncable/test/subscription_adapter/common.rb b/actioncable/test/subscription_adapter/common.rb index bf4dd701fc..1538157995 100644 --- a/actioncable/test/subscription_adapter/common.rb +++ b/actioncable/test/subscription_adapter/common.rb @@ -23,7 +23,6 @@ module CommonSubscriptionAdapterTest [@rx_adapter, @tx_adapter].uniq.each(&:shutdown) end - def subscribe_as_queue(channel, adapter = @rx_adapter) queue = Queue.new @@ -41,7 +40,6 @@ module CommonSubscriptionAdapterTest adapter.unsubscribe(channel, callback) if subscribed.set? end - def test_subscribe_and_unsubscribe subscribe_as_queue("channel") do |queue| end |