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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \| \| \| \| \| \| \| \| \| \|	Also, address the possibility of the listen thread dying and needing to be respawned. As a bonus, we now defer construction of the thread until we are first given something to monitor.
\| *	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
\| \| \| \|	(as adapted to use concurrent-ruby / nio4r instead of eventmachine)
*	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
\| \| \| \| \| \| \|	- adapter -> pubsub (re)rename internally - Change variable names to match method names - Add EventMachine `~> 1.0` as a runtime dependency of ActionCable - Refactor dependency loading for adapters
*	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
\| \| \| \| \|	This reverts commit d0393fccffc118a5de37654aa222774b66123393, reversing changes made to 3b7ccadfc1c8dfec61af898167e1300b17f5cf25.
*	[ci skip] Fix typo in docs	DAVID MOORE	2016-01-15	1	-1/+1
\| \| \| \| \|	Found this small omission while reviewing the ActionCable docs. [Dave Moore]
*	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes 8 runtime gem dependencies from Rails: ``` Using hitimes 1.2.3 Using timers 4.1.1 Using celluloid-essentials 0.20.5 Using celluloid-extras 0.20.5 Using celluloid-fsm 0.20.5 Using celluloid-pool 0.20.5 Using celluloid-supervision 0.20.5 Using celluloid 0.17.2 ```
*	[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 test
\| *	Remove warnings from actioncable	Arun Agrawal	2015-12-17	4	-4/+8
\| \| \| \| \| \| \| \|	Warnings coming from code and test are removed
* \|	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