Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Action Cable into master #22586

Merged
merged 513 commits into from Dec 17, 2015
Merged

Merge Action Cable into master #22586

merged 513 commits into from Dec 17, 2015

Conversation

dhh
Copy link
Member

@dhh dhh commented Dec 14, 2015

Working in a branch so everyone in rails/rails can collaborate.

Lachlan Sylvester and others added 30 commits July 9, 2015 13:07
Generated from a fresh `bundle install`

* Add websocket-driver
* Update activesupport
* Rename `actioncable` -> `action_cable`
…-error

Up[date README sample code so there is no syntax error
ActionCable.server should always return the same instance
Fix CoffeeScript syntax in code examples
update documentation to use websocket protocol
update README to include creating the ApplicationCabel::Channel
Fix double ` ```ruby ` within the same code block.
README.md code block fix
…xample file for creating App.cable not conflict with the action cable js libs
celluoid -> celluloid
small typo on README.md
rafaelfranca and others added 21 commits December 16, 2015 17:01
Still missing the stuff in app/ – we need to basically switch from a *
match to specifically picking out what we need.
Rack::Server already does it work for us if the server is installed.
Since we require you to enable it on the client-side, let us do the
same on the server-side. Then you’re not running an EventMachine unless
you need to.
dhh added a commit that referenced this pull request Dec 17, 2015
@dhh dhh merged commit 48f5cec into master Dec 17, 2015
@dhh dhh deleted the merge-action-cable branch December 17, 2015 11:13
@rafaelfranca rafaelfranca modified the milestones: 5.0.0 [temp], 5.0.0 Dec 30, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet