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

	Commit message (Collapse)	Author	Age	Files	Lines
*	remove redundant curlies from hash arguments	Xavier Noria	2016-08-06	1	-2/+2
\|
*	applies new string literal convention in actioncable/test	Xavier Noria	2016-08-06	1	-8/+8
\| \| \| \| \|	The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
*	Merge pull request #23992 from matthewd/em-option	Matthew Draper	2016-03-04	1	-3/+4
\|\ \| \| \| \|	Support faye-websocket + EventMachine as an option
\| *	Support faye-websocket + EventMachine as an option	Matthew Draper	2016-03-02	1	-3/+4
\| \|
* \|	Added welcome message type and fix test hacks	Daniel Rhodes	2016-03-01	1	-1/+1
\|/
*	Only hijack Rack socket when first needed	Jon Moss	2016-02-24	1	-0/+20
\| \| \| \|	Fixes #23471
*	Confirm connection monitor subscription on open	Pratik Naik	2016-02-23	1	-1/+1
\|
*	Revert "Revert "Eliminate the EventMachine dependency""	Matthew Draper	2016-01-30	1	-9/+10
\|
*	Revert "Eliminate the EventMachine dependency"	David Heinemeier Hansson	2016-01-27	1	-10/+9
\|
*	Import the relevant portions of faye-websocket	Matthew Draper	2016-01-24	1	-3/+3
\| \| \| \|	(as adapted to use concurrent-ruby / nio4r instead of eventmachine)
*	Using a hacked faye-websocket, drop EventMachine	Matthew Draper	2016-01-24	1	-6/+7
\|
*	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/+118