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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23352 from yui-knk/move_test_conditions	Rafael França	2016-01-30	1	-11/+9
\|\
\| *	There is no need to define test if a connection does not support primary_key	yui-knk	2016-01-31	1	-11/+9
* \|	Merge pull request #23353 from kamipo/remove_unused_lost_connection_error_mes...	Rafael França	2016-01-30	1	-6/+0
\|\ \
\| * \|	Remove unused `LOST_CONNECTION_ERROR_MESSAGES`	Ryuta Kamizono	2016-01-31	1	-6/+0
* \| \|	Merge pull request #23347 from yui-knk/explicitly_define_columns_as_interface	Rafael França	2016-01-30	1	-1/+3
\|\ \ \
\| * \| \|	Explicitly define `columns` method as an interface	yui-knk	2016-01-30	1	-1/+3
\| \|/ /
* \| \|	Merge pull request #23342 from y-yagi/remove_unused_variable	Rafael França	2016-01-30	1	-1/+1
\|\ \ \
\| * \| \|	remove unused variable from render test	yuuji.yaginuma	2016-01-30	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #23343 from y-yagi/remove_unused_require	Rafael França	2016-01-30	1	-1/+0
\|\ \ \
\| * \| \|	remove unused require	yuuji.yaginuma	2016-01-30	1	-1/+0
\| \|/ /
* \| \|	Allow failures for Action Cable tests	Rafael Mendonça França	2016-01-30	1	-0/+1
* \| \|	Merge pull request #23351 from y-yagi/remove_gsub_for_action_cable_meta_tag	Rafael França	2016-01-30	1	-1/+0
\|\ \ \
\| * \| \|	remove unnecessary gsub for `action_cable_meta_tag`	yuuji.yaginuma	2016-01-30	1	-1/+0
\| \|/ /
* \| \|	Merge pull request #23346 from kamipo/refactor_oid_money_precision	Rafael França	2016-01-30	2	-9/+5
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Refactor `OID::Money.precision`	Ryuta Kamizono	2016-01-30	2	-9/+5
\| \|/
* /	Handle response_body= when body is nil	eileencodes	2016-01-30	2	-0/+17
\|/
*	Merge pull request #23317 from rfmanuel/after-bundle-in-rails-plugin-template	Rafael França	2016-01-29	4	-2/+42
\|\
\| *	Implemented pull request changes.	Ryan Manuel	2016-01-29	2	-10/+5
\| *	Update doc with appropriate issue and pull request versions	Ryan Manuel	2016-01-28	2	-2/+2
\| *	Add an after_bundle callback in Rails plugin templates	Ryan Manuel	2016-01-28	5	-2/+47
* \|	Merge pull request #23338 from tawan/update-doc-request-headers-access	Jon Moss	2016-01-29	1	-1/+15
\|\ \
\| * \|	Add additional documentation on Headers#[] [ci skip]	Tawan Sierek	2016-01-29	1	-1/+15
* \| \|	Use a gentler disconnect	Matthew Draper	2016-01-30	1	-2/+2
\|/ /
* \|	Don't bother stopping EM between tests	Matthew Draper	2016-01-30	1	-38/+3
* \|	Intervene on change_table as well as create_table	Matthew Draper	2016-01-30	1	-0/+13
* \|	Merge pull request #23336 from kesha-antonov/patch-1	Rafael França	2016-01-29	1	-2/+0
\|\ \
\| * \|	remove require logging	Kesha Antonov	2016-01-29	1	-2/+0
\|/ /
* \|	Merge pull request #23305 from matthewd/concurrent-take-2	Matthew Draper	2016-01-30	31	-117/+738
\|\ \
\| * \|	Keep the socket reference after close	Matthew Draper	2016-01-30	1	-3/+2
\| * \|	Reduce the client count, in hope of a more consistent test	Matthew Draper	2016-01-30	1	-3/+3
\| * \|	Be more patient while gathering the expected responses	Matthew Draper	2016-01-30	1	-4/+3
\| * \|	Handle more IO errors (especially, ECONNRESET)	Matthew Draper	2016-01-30	3	-21/+78
\| * \|	Add a couple of tests that connect with a WS client	Matthew Draper	2016-01-30	4	-0/+257
\| * \|	Synchronize the lazy setters in Server	Matthew Draper	2016-01-30	5	-15/+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	27	-106/+385
\|/ /
* \|	Don't recommend using `ActiveRecord::Base[]`	Sean Griffin	2016-01-29	1	-3/+0
* \|	Merge pull request #23330 from prathamesh-sonpatki/fix-tests	Matthew Draper	2016-01-29	1	-0/+2
\|\ \
\| * \|	Fix broken number_to_currency tests	Prathamesh Sonpatki	2016-01-29	1	-0/+2
\|/ /
* \|	Merge pull request #23252 from kamipo/remove_limit_11	Rafael França	2016-01-29	1	-1/+0
\|\ \
\| * \|	Remove `limit: 11` as backward-compatibility with Rails 2.0	Ryuta Kamizono	2016-01-27	1	-1/+0
* \| \|	Merge pull request #23188 from jcoleman/ar-connection-execute-docs-clarification	Rafael França	2016-01-29	2	-1/+7
\|\ \ \
\| * \| \|	Clarify DatabaseStatements#execute docs re: memory usage.	James Coleman	2016-01-22	2	-1/+7
* \| \| \|	Merge pull request #23329 from prathamesh-sonpatki/fix-23320	Rafael França	2016-01-29	3	-6/+16
\|\ \ \ \
\| * \| \| \|	Change number_to_currency behavior for checking negativity	Prathamesh Sonpatki	2016-01-29	3	-6/+16
* \| \| \| \|	Merge pull request #23296 from radar/cache-fragment-name-options	Rafael Mendonça França	2016-01-29	1	-2/+3
\|\ \ \ \ \
\| * \| \| \| \|	Slice out options for cache_fragment_name explicitly	Ryan Bigg	2016-01-28	1	-1/+2
* \| \| \| \| \|	Merge pull request #22800 from dgynn/pr_cache_helper_options	Rafael Mendonça França	2016-01-29	3	-1/+16
\|\ \ \ \ \ \
\| * \| \| \| \| \|	restore ability to pass extra options to cache stores	Dave Gynn	2015-12-26	3	-1/+16
* \| \| \| \| \| \|	Merge pull request #23326 from fgo/patch-16	Rafael França	2016-01-28	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|