aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* First take at cross site forgery protectionPratik Naik2015-10-075-1/+83
|
* Merge pull request #83 from gregmolnar/readme_fixEileen M. Uchitelle2015-10-031-1/+1
|\ | | | | use correct filename in example
| * use correct filename in exampleGreg Molnar2015-10-031-1/+1
|/ | | | closes #80
* EventMachine: shush epoll warnings by checking for support before enabling. ↵Jeremy Daer2015-09-021-1/+2
| | | | Ditto for kqueue.
* Merge pull request #71 from rails/coffee-onlyRafael Mendonça França2015-09-026-0/+0
|\ | | | | .js.coffee -> .coffee
| * .js.coffee -> .coffeeRafael Mendonça França2015-09-026-0/+0
|/ | | | | | | It was initially required, but support for the shorthand has been supported since sprockets 2.1. Eventually 4.x will only support the shorthand version. Just want to get new people using the prefer stuff ASAP.
* Merge branch 'better-reconnect'Javan Makhmali2015-09-012-30/+24
|\
| * Increment styleJavan Makhmali2015-08-311-3/+2
| |
| * Guard against opening multiple connectionsJavan Makhmali2015-08-311-1/+1
| |
| * Immediately reconnect after first disconnectJavan Makhmali2015-08-281-0/+7
| |
| * Only send "disconnected" notification onceJavan Makhmali2015-08-281-2/+8
| |
| * Simplify WebSocket reconnects and guard against opening multiple connectionsJavan Makhmali2015-08-281-27/+9
|/
* Merge pull request #65 from ↵Kasper Timm Hansen2015-08-242-1/+40
|\ | | | | | | | | mrlhumphreys/support-identifiers-without-to-global-id Support connection identifiers that don't implement to_global_id
| * support connection identifiers that don't implement to_global_id by ↵Mark Humphreys2015-08-242-1/+40
| | | | | | | | defaulting to to_s
* | Record last 20 Subscription notifications for inspectionJavan Makhmali2015-08-231-1/+12
| |
* | Immediately reconnect when visibilityState changes to "visible"Javan Makhmali2015-08-231-0/+9
|/
* Merge pull request #59 from kaichen/patch-1David Heinemeier Hansson2015-08-131-2/+0
|\ | | | | Remove out-of-date AC::Broadcaster reference
| * Remove out-of-date AC::Broadcaster referenceKai Chen = 陈恺2015-08-131-2/+0
|/ | | Remove out-of-data autoload reference of ActionCable::Broadcaster that removed at e1a99a83ca135523ff8513be756f156500999cb8 .
* Merge pull request #58 from lsylvester/clear-out-stopped-streamsDavid Heinemeier Hansson2015-08-111-1/+1
|\ | | | | Clear out the streams when they are stopped.
| * Clear out the streams when they are stopped. Otherwise we will keep trying ↵Lachlan Sylvester2015-08-111-1/+1
| | | | | | | | to stop them.
* | Merge pull request #39 from maclover7/patch-1Rafael Mendonça França2015-08-031-8/+7
|\ \ | |/ |/| Update README.md
| * Update README.mdJon Moss2015-07-261-8/+7
| | | | | | This includes small styling / grammar changes to the README
* | Merge pull request #54 from lsylvester/require-to_paramKasper Timm Hansen2015-08-032-1/+2
|\ \ | | | | | | Move require of to_param to where it is needed
| * | move the require of object/to_param to channel/broadcasting because that is ↵Lachlan Sylvester2015-08-022-1/+2
| | | | | | | | | | | | where it is needed.
* | | Merge pull request #50 from lsylvester/fix-stream-for-documentationKasper Timm Hansen2015-08-021-1/+1
|\ \ \ | |/ / |/| | update docs for broadcast_to to pass a message.
| * | update docs for broadcast_to to pass a message to broadcast.Lachlan Sylvester2015-08-021-1/+1
| | |
* | | Merge pull request #49 from jasondew/channel_broadcasting_test_fixKasper Timm Hansen2015-07-301-0/+1
|\ \ \ | | | | | | | | Fixes test failure in ActionCable::Channel::BroadcastingTest when run by itself
| * | | Fixes test failure in ActionCable::Channel::BroadcastingTest when run by itselfJason Dew2015-07-301-0/+1
| |/ /
* | | Merge pull request #48 from jasondew/documentation_and_whitespace_fixesDavid Heinemeier Hansson2015-07-305-16/+16
|\ \ \ | |/ / |/| | Fixing documentation, correcting grammar, and removing unnecessary whitespace
| * | Fixing some documentation, correcting grammar, and removing unnecessary ↵Jason Dew2015-07-305-16/+16
|/ / | | | | | | whitespace
* | Merge pull request #42 from lsylvester/channel-lookup-refactorKasper Timm Hansen2015-07-303-6/+4
|\ \ | | | | | | Optimize channel class lookup
| * | refactor channel look up to use a hash instead of an array and reduce the ↵Lachlan Sylvester2015-07-303-6/+4
|/ / | | | | | | number of calls to safe_constantize because it can be slow
* | Fix the gem version in Gemfile.lockKasper Timm Hansen2015-07-291-1/+1
| |
* | Merge pull request #45 from kaspth/run-travisKasper Timm Hansen2015-07-292-0/+20
|\ \ | | | | | | Run tests with Travis.
| * | Run tests with Travis.Kasper Timm Hansen2015-07-292-0/+20
|/ /
* | Merge pull request #34 from ↵Kasper Timm Hansen2015-07-2911-14/+139
|\ \ | | | | | | | | | | | | lsylvester/add-broadcast_to-and-stream_for-methods-to-channel add broadcast_to and stream_for methods as per #26
| * | add broadcast_to and stream_for methods as per #26Lachlan Sylvester2015-07-2811-14/+139
| | |
* | | Merge pull request #41 from craigsheen/move_version_to_version_fileMatthew Draper2015-07-273-3/+8
|\ \ \ | |_|/ |/| | Move VERSION constant to version file and use this in the gemspec
| * | require new version file so the constant is available to the applicationCraig Sheen2015-07-271-0/+1
| | |
| * | Move VERSION constant to version file and use this in the gemspecCraig Sheen2015-07-273-3/+7
|/ /
* | Merge pull request #37 from rails/downgrade-celluloidDavid Heinemeier Hansson2015-07-243-46/+5
|\ \ | | | | | | Use Celluloid 0.16.0 until termination issue in 0.17.0 is resolved
| * | Use Celluloid 0.16.0 until termination issue in 0.17.0 is resolvedJavan Makhmali2015-07-243-46/+5
|/ / | | | | | | The issue: https://github.com/celluloid/celluloid/issues/637
* | Don't unsubscribe on the server when another subscription with the same ↵Javan Makhmali2015-07-231-2/+6
| | | | | | | | identifier is active
* | Merge pull request #36 from cristianbica/channel-action-dispatchedKasper Timm Hansen2015-07-232-4/+75
|\ \ | | | | | | Improve channel actions dispatcher to allow inheritance/mixins
| * | Improve channel actions dispatcher to allow inheritance/mixinsCristian Bica2015-07-232-4/+75
|/ / | | | | | | Fixes #14
* | Merge pull request #35 from twalpole/gem_updatesDavid Heinemeier Hansson2015-07-234-13/+56
|\ \ | |/ |/| Update gems and requires
| * Update gems and requiresThomas Walpole2015-07-224-13/+56
|/
* Merge pull request #31 from constXife/masterRafael Mendonça França2015-07-202-0/+16
|\ | | | | Add coffee-rails as a dependency.
| * Remove version requirements.constXife2015-07-202-4/+4
| |
| * Add coffee-rails as a dependency.constXife2015-07-202-0/+16
| |