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

	Commit message (Expand)	Author	Age	Files	Lines
*	Revert "Eliminate the EventMachine dependency"	David Heinemeier Hansson	2016-01-27	2	-7/+5
*	Merge pull request #23185 from droptheplot/actioncable-custom-channels	Kasper Timm Hansen	2016-01-24	1	-3/+5
\|\
\| *	Rename channels_path var and fix channel_paths method for ActionCable config	Sergey Novikov	2016-01-23	1	-5/+5
\| *	Allow adding custom paths for action_cable channels	Sergey Novikov	2016-01-22	1	-2/+4
* \|	Import the relevant portions of faye-websocket	Matthew Draper	2016-01-24	1	-0/+4
* \|	Using a hacked faye-websocket, drop EventMachine	Matthew Draper	2016-01-24	1	-5/+3
\|/
*	Merge pull request #22950 from maclover7/adapterize-storage-actioncable	Matthew Draper	2016-01-20	3	-26/+24
\|\
\| *	Fix code review comments	Jon Moss	2016-01-18	3	-8/+17
\| *	Small PostgreSQL adapter refactors / cleanup	Jon Moss	2016-01-18	1	-1/+0
\| *	ActionCable::StorageAdapter ==> ActionCable::SubscriptionAdapter	Jon Moss	2016-01-18	2	-4/+6
\| *	config_opts => cable, per @kaspth	Jon Moss	2016-01-18	1	-2/+2
\| *	Tests passing and small refactoring	Jon Moss	2016-01-18	1	-1/+1
\| *	Pull the action methods directly onto the adapter	Matthew Draper	2016-01-18	2	-4/+3
\| *	Refactor storage_adapter	Jon Moss	2016-01-18	1	-11/+3
\| *	Adapterize ActionCable storage and extract behavior	Jon Moss	2016-01-18	3	-25/+22
\|/
*	Fix the updated API (this sorts the concurrent-ruby switch with Basecamp)	David Heinemeier Hansson	2016-01-16	1	-1/+1
*	Revert "Merge pull request #22977 from rails/revert-22934-master"	David Heinemeier Hansson	2016-01-16	2	-16/+42
*	Revert "Move async execution from celluloid to concurrent-ruby"	David Heinemeier Hansson	2016-01-08	2	-42/+16
*	don't need explicit dep and a pretty neat pick	Mike Perham	2016-01-05	1	-1/+1
*	Use Module#thread_mattr_accessor	Mike Perham	2016-01-05	1	-8/+6
*	Move async execution from celluloid to concurrent-ruby	Mike Perham	2016-01-05	2	-16/+44
*	[ci skip] Fix grammar	Akshay Vishnoi	2015-12-18	2	-2/+2
*	Don't log Action Cable to STDOUT in development	eileencodes	2015-12-17	1	-8/+0
*	Cargo cult fix to make Celluloid behave	David Heinemeier Hansson	2015-12-16	1	-0/+3
*	Move the require to the right place	Rafael Mendonça França	2015-12-15	1	-2/+0
*	Remove the default logger	Rafael Mendonça França	2015-12-15	1	-1/+0
*	Configure the Action Cable's redis in the engine	Rafael Mendonça França	2015-12-15	1	-22/+1
*	Get ready to merge into Rails	David Heinemeier Hansson	2015-12-14	6	-0/+296