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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23992 from matthewd/em-option	Matthew Draper	2016-03-04	7	-12/+107
\|\
\| *	Support faye-websocket + EventMachine as an option	Matthew Draper	2016-03-02	7	-12/+107
* \|	Accept JSON with no backslashes/escaping	Jon Moss	2016-03-02	1	-6/+19
* \|	Merge pull request #23976 from danielrhodes/enhancement/ac-ping-to-message-type	Matthew Draper	2016-03-02	1	-5/+5
\|\ \ \| \|/ \|/\|
\| *	Make ping into a message type	Daniel Rhodes	2016-03-01	1	-1/+1
\| *	Added welcome message type and fix test hacks	Daniel Rhodes	2016-03-01	1	-4/+4
* \|	Use AS::Executor / AS::Reloader to support reloading in ActionCable	Matthew Draper	2016-03-02	1	-2/+3
\|/
*	The async.callback call should live with the hijack	Matthew Draper	2016-02-26	1	-4/+5
*	Only hijack Rack socket when first needed	Jon Moss	2016-02-24	2	-10/+9
*	Merge pull request #23813 from lifo/faye-websocket	David Heinemeier Hansson	2016-02-23	1	-1/+8
\|\
\| *	Confirm connection monitor subscription on open	Pratik Naik	2016-02-23	1	-1/+8
* \|	Merge pull request #23668 from maclover7/cable-docs	Rafael França	2016-02-22	4	-15/+14
\|\ \ \| \|/ \|/\|
\| *	Full Action Cable documentation read through	Jon Moss	2016-02-17	4	-15/+14
* \|	Fix `unsubscribed` server side behavior	Jon Moss	2016-02-18	2	-6/+3
\|/
*	Fix grammar `a` to `an` [ci skip]	Ryuta Kamizono	2016-02-13	1	-1/+1
*	Merge remote-tracking branch 'origin/master' into actioncable_logging	kp	2016-02-10	3	-26/+50
\|\
\| *	Handle more IO errors (especially, ECONNRESET)	Matthew Draper	2016-01-30	1	-21/+47
\| *	Fix arguments to on_close	Matthew Draper	2016-01-30	2	-5/+3
\| *	Revert "Revert "Eliminate the EventMachine dependency""	Matthew Draper	2016-01-30	6	-22/+315
\| *	Revert "Eliminate the EventMachine dependency"	David Heinemeier Hansson	2016-01-27	6	-315/+22
* \|	Logs successful and invalid connections separately	kp	2016-02-10	1	-8/+12
* \|	adds debug logging to actioncable connect	kp	2016-01-26	1	-2/+12
\|/
*	Import the relevant portions of faye-websocket	Matthew Draper	2016-01-24	5	-20/+313
*	Using a hacked faye-websocket, drop EventMachine	Matthew Draper	2016-01-24	1	-2/+2
*	Fix code review comments	Jon Moss	2016-01-18	2	-3/+3
*	Pull the action methods directly onto the adapter	Matthew Draper	2016-01-18	2	-3/+3
*	Adapterize ActionCable storage and extract behavior	Jon Moss	2016-01-18	2	-7/+7
*	Revert "Merge pull request #22977 from rails/revert-22934-master"	David Heinemeier Hansson	2016-01-16	1	-1/+1
*	[ci skip] Fix typo in docs	DAVID MOORE	2016-01-15	1	-1/+1
*	Revert "Move async execution from celluloid to concurrent-ruby"	David Heinemeier Hansson	2016-01-08	1	-1/+1
*	Move async execution from celluloid to concurrent-ruby	Mike Perham	2016-01-05	1	-1/+1
*	[ActionCable] remove not needed protected call and newlines	Jan Habermann	2015-12-25	2	-9/+1
*	Merge pull request #22639 from arunagw/aa-remove-few-warnings-actioncable	Guillermo Iguaran	2015-12-17	4	-4/+8
\|\
\| *	Remove warnings from actioncable	Arun Agrawal	2015-12-17	4	-4/+8
* \|	traditional make sense with `<tt>ActiveSupport::TaggedLogging</tt>`	Gaurav Sharma	2015-12-18	1	-2/+2
\|/
*	Get ready to merge into Rails	David Heinemeier Hansson	2015-12-14	8	-0/+520