rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #23096 from HayleyCAnderson/ha-action-cable-docs	Jon Moss	2016-01-18	1	-20/+31
\|\ \| \| \| \|	[ci skip] Improve Action Cable configuration explanations
\| *	Improve Action Cable configuration explanations	Hayley Anderson	2016-01-18	1	-20/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Clarify wording around how defaults work * Clarify wording around what formatting versus information is required * Separate consumer configuration section since it is important and wordy * Add additional explanation of options for setting consumer configuration * Consolidate consumer configuration information to reduce confusion
* \|	Revert "Merge pull request #22977 from rails/revert-22934-master"	David Heinemeier Hansson	2016-01-16	1	-1/+1
\|/ \| \| \| \|	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	-1/+1
\|
*	Remove celluloid references	Mike Perham	2016-01-05	1	-1/+1
\|
*	[ci skip] Steal `ActionCable.server` mounting from routes template.	Kasper Timm Hansen	2015-12-22	1	-2/+2
\| \| \| \| \|	Mounting it as prescribed here: https://github.com/rails/rails/blob/0d1d50c2db40ea1a9d3bebfb0c35da43bbd4d27f/railties/lib/rails/generators/rails/app/templates/config/routes.rb#L5
*	Update "Support" in ActionCable README [ci skip]	Robert Eshleman	2015-12-21	1	-2/+10
\| \| \| \| \|	* Add link to API documentation * Link to issue tracker for rails/rails (instead of rails/actioncable) * Add link to rails-core mailing list for feature requests
*	One long dash in headline.	henning mueller	2015-12-21	1	-1/+1
\|
*	Use default cable path in (in-app) server config example.	henning mueller	2015-12-21	1	-3/+3
\|
*	Replaced "Cable" by "ActionCable" in CoffeeScript examples.	henning mueller	2015-12-21	1	-2/+2
\|
*	docs, follow up to #22699. [ci skip]	Yves Senn	2015-12-19	1	-2/+2
\|
*	Update README.md	Oleg Motenko	2015-12-19	1	-1/+1
\|
*	Stray line	David Heinemeier Hansson	2015-12-18	1	-1/+2
\|
*	Simplify	David Heinemeier Hansson	2015-12-18	1	-9/+2
\|
*	Now available in action_cable	David Heinemeier Hansson	2015-12-18	1	-2/+2
\|
*	[ci skip] Fix grammar	Akshay Vishnoi	2015-12-18	1	-3/+3
\|
*	Update README.md	Xavier Noria	2015-12-17	1	-1/+1
\| \| \|	ActiveRecord -> Active Record [ci skip]
*	Configure the Action Cable's redis in the engine	Rafael Mendonça França	2015-12-15	1	-1/+1
\| \| \| \|	This will decouple Action Cable from Rails.
*	Remove rails/actioncable Travis badge	claudiob	2015-12-15	1	-2/+1
\| \| \| \| \| \| \| \| \| \|	[ci skip] Since Action Cable is getting integrated into rails/rails, the Travis badge for rails/actioncable is not needed anymore. Also following the standard of every other README to have `--` rather than `-` to separating the name of the library from its description.
*	Bring latest changes over from actioncable/master	Javan Makhmali	2015-12-15	1	-3/+3
\|
*	Remove Alpha disclaimer from ActionCable	claudiob	2015-12-14	1	-21/+0
\| \| \| \|	[ci skip] Getting to ready to merge into rails/rails
*	Get ready to merge into Rails	David Heinemeier Hansson	2015-12-14	1	-0/+485