Merge branch 'master' into treewip

* master:
  eliminate warnings about multiple primary keys on habtm join tables
  Add methods to array delegation from `Relation`
  Fix button_to's params option to support nested names.
  Dependencies clean up
  Deprecate AC::Parameters#== with a Hash
  Fix AC::Parameters#== with other AC::Parameters
  Tests for AC::Parameters#==
  better docs for ActiveSupport::TestCase#assert_nothing_raised
  remove needless `debug_exception_response_format` config [ci skip]
  partial pass over the API guide [ci skip]
  Fix `unsubscribed` server side behavior
  Use a semaphore to signal message availability
  Fix master build
  Remove github gems from the master bug report templates
  Truncate ActionCable broadcast message to 300 chars
  Remove unused require

1 files changed, 1 insertions, 1 deletions

diff --git a/actioncable/lib/action_cable/connection/subscriptions.rb b/actioncable/lib/action_cable/connection/subscriptions.rb
index d7f95e6a62..24934e12f2 100644
--- a/actioncable/lib/action_cable/connection/subscriptions.rb
+++ b/actioncable/lib/action_cable/connection/subscriptions.rb
@@ -54,7 +54,7 @@ module ActionCable
       end
 
       def unsubscribe_from_all
-        subscriptions.each { |id, channel| channel.unsubscribe_from_channel }
+        subscriptions.each { |id, channel| remove_subscription(channel) }
       end
 
       protected