aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable/connection/base.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2016-02-19 15:59:09 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2016-02-19 15:59:09 -0800
commit0c9f5f56f7a1628c8c9ff3a91a52f17a15e31b26 (patch)
tree3818883184b07c64ba7e96f88cfc0f8734e54405 /actioncable/lib/action_cable/connection/base.rb
parent8a5059383e7bf4bfe0bfd308ab511d578b1a6ce8 (diff)
parent2df891dccdcfbdfb176c55297589712ac379f87d (diff)
downloadrails-0c9f5f56f7a1628c8c9ff3a91a52f17a15e31b26.tar.gz
rails-0c9f5f56f7a1628c8c9ff3a91a52f17a15e31b26.tar.bz2
rails-0c9f5f56f7a1628c8c9ff3a91a52f17a15e31b26.zip
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
Diffstat (limited to 'actioncable/lib/action_cable/connection/base.rb')
0 files changed, 0 insertions, 0 deletions