Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23992 from matthewd/em-option | Matthew Draper | 2016-03-04 | 1 | -1/+1 |
|\ | | | | | Support faye-websocket + EventMachine as an option | ||||
| * | Support faye-websocket + EventMachine as an option | Matthew Draper | 2016-03-02 | 1 | -1/+1 |
| | | |||||
* | | Accept JSON with no backslashes/escaping | Jon Moss | 2016-03-02 | 1 | -2/+2 |
|/ | | | | | | | Fixes #22675 Allow channel identifiers and also data with no backslahes/escaping to be accepted by the subscription storer. | ||||
* | Revert "Merge pull request #22977 from rails/revert-22934-master" | David Heinemeier Hansson | 2016-01-16 | 1 | -1/+0 |
| | | | | | This reverts commit d0393fccffc118a5de37654aa222774b66123393, reversing changes made to 3b7ccadfc1c8dfec61af898167e1300b17f5cf25. | ||||
* | Revert "Move async execution from celluloid to concurrent-ruby" | David Heinemeier Hansson | 2016-01-08 | 1 | -0/+1 |
| | |||||
* | Remove celluloid references | Mike Perham | 2016-01-05 | 1 | -1/+0 |
| | |||||
* | Get ready to merge into Rails | David Heinemeier Hansson | 2015-12-14 | 1 | -0/+116 |