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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #26547 from palkan/fix/actioncable-confirmation-race-condi...	Matthew Draper	2016-10-01	9	-24/+83
\|\
\| *	Add Channel#ensure_confirmation_sent; call #subscribe_to_channel after initia...	palkan	2016-09-22	7	-33/+39
\| *	[Fix #25381] Avoid race condition on subscription confirmation	palkan	2016-09-20	6	-15/+60
* \|	Merge pull request #26675 from j1wilmot/update-docs	Jon Moss	2016-09-30	1	-1/+0
\|\ \
\| * \|	Remove dup distinct from AR query list [ci skip]	Jeremy Wilmot	2016-09-30	1	-1/+0
\|/ /
* \|	Merge pull request #26584 from Shopify/cached-query-name	Rafael França	2016-09-30	4	-11/+18
\|\ \
\| * \|	Preserve cached queries name in AS notifications	Jean Boussier	2016-09-22	4	-11/+18
* \| \|	Merge pull request #26646 from matthewd/cable-buffer	Matthew Draper	2016-10-01	4	-12/+100
\|\ \ \
\| * \| \|	Buffer writes to the cable sockets	Matthew Draper	2016-09-28	4	-12/+100
* \| \| \|	Merge pull request #26147 from matthewd/callback-backtrace	Matthew Draper	2016-10-01	2	-135/+274
\|\ \ \ \
\| * \| \| \|	Tighten the backtrace pollution from passing through callbacks	Matthew Draper	2016-09-30	2	-135/+274
\|/ / / /
* \| \| \|	Don't skip in-memory insertion of associations when loaded in validate	Sean Griffin	2016-09-29	4	-16/+43
* \| \| \|	Merge pull request #26660 from unasuke/fix_typo_in_5_0_release_notes	Vipul A M	2016-09-29	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix typo in 5_0_release_notes.md doc [ci skip]	Yusuke Nakamura	2016-09-29	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #26659 from y-yagi/remove_mongrel_once_again	Kasper Timm Hansen	2016-09-29	1	-1/+1
\|\ \ \ \
\| * \| \| \|	remove `mongrel` once again	yuuji.yaginuma	2016-09-29	1	-1/+1
* \| \| \| \|	Merge pull request #26402 from mtsmfm/remove-dead-constants	Akira Matsuda	2016-09-29	1	-30/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Remove dead constants	Fumiaki MATSUSHIMA	2016-09-06	1	-30/+0
* \| \| \| \|	Merge pull request #26648 from y-yagi/update_description_of_queue_adapter	Jon Moss	2016-09-28	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	update description of queue adapter in test [ci skip]	yuuji.yaginuma	2016-09-28	1	-2/+2
* \| \| \| \| \|	Merge pull request #26654 from Neodelf/activesupport_1	Jon Moss	2016-09-28	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[ci skip] Remove not necessary whitespace	Andrey Molchanov	2016-09-28	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #26653 from Neodelf/new_branch_name	Jon Moss	2016-09-28	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] Use right format text	Andrey Molchanov	2016-09-28	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #26652 from Neodelf/activesupport_2	Jon Moss	2016-09-28	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	[ci skip] Use class name instead of path to file	Andrey Molchanov	2016-09-28	1	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #26649 from michaellennox/remove_broken_perf_test_link	प्रथमेश Sonpatki	2016-09-28	1	-1/+0
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Removes broken performance testing link from the 2.2 release notes	Michael Lennox	2016-09-28	1	-1/+0
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #26637 from y-yagi/prevent_plugin_test_run_twice	Kasper Timm Hansen	2016-09-27	2	-1/+9
\|\ \ \ \ \ \
\| * \| \| \| \| \|	use `active_support/testing/autorun` in `bin/test` script	yuuji.yaginuma	2016-09-27	2	-1/+9
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #26573 from kirs/action-controller-as-format	Rafael França	2016-09-27	2	-4/+9
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Make :as option also set request format (AC::TestCase)	Kir Shatrov	2016-09-21	2	-4/+9
* \| \| \| \| \| \|	Merge pull request #26640 from Shopify/fix-am-errors-to-hash-default-proc	Rafael França	2016-09-27	2	-1/+11
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Do not leak the Errors default proc when calling to_hash or as_json	Jean Boussier	2016-09-27	2	-1/+11
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #26636 from y-yagi/fix_typo_in_all_week	प्रथमेश Sonpatki	2016-09-27	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	fix typo in `DateAndTime::Calculations#all_week` doc [ci skip]	yuuji.yaginuma	2016-09-27	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #26629 from kamipo/fix_doc_format	Jon Moss	2016-09-26	1	-3/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Fix doc format for `RecordFetchWarning` [ci skip]	Ryuta Kamizono	2016-09-27	1	-3/+3
* \| \| \| \| \| \|	Merge pull request #26414 from rails/rails-commands	Kasper Timm Hansen	2016-09-26	38	-766/+1005
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Apply test command changes.	Kasper Timm Hansen	2016-09-26	1	-1/+3
\| * \| \| \| \| \| \|	Fix server command tests.	Kasper Timm Hansen	2016-09-25	1	-1/+2
\| * \| \| \| \| \| \|	Fix dbconsole tests.	Kasper Timm Hansen	2016-09-25	2	-28/+59
\| * \| \| \| \| \| \|	Apply Rafaels review fixes.	Kasper Timm Hansen	2016-09-25	3	-3/+4
\| * \| \| \| \| \| \|	Fix console tests.	Kasper Timm Hansen	2016-09-25	3	-7/+33
\| * \| \| \| \| \| \|	Remove the old command files.	Kasper Timm Hansen	2016-09-25	14	-880/+0
\| * \| \| \| \| \| \|	Per Dr. Eileen's orders :)	Kasper Timm Hansen	2016-09-25	3	-5/+7
\| * \| \| \| \| \| \|	Simplify auxiliary command files directory finding.	Kasper Timm Hansen	2016-09-25	1	-1/+1
\| * \| \| \| \| \| \|	Run engine commands through command infrastructure.	Kasper Timm Hansen	2016-09-25	6	-14/+54
\| * \| \| \| \| \| \|	Initial command structure.	Kasper Timm Hansen	2016-09-25	25	-160/+1176
* \| \| \| \| \| \| \|	Use xor to avoid allocations in `AR::Core#hash`	Sean Griffin	2016-09-26	1	-1/+1