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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #6493 from markmcspadden/hash_keys_order_methods	Rafael Mendonça França	2012-05-25	1	-7/+7
\|\
\| *	Reorder deep_symbolize_keys methods	Mark McSpadden	2012-05-25	1	-7/+7
\|/
*	Merge pull request #5872 from evtuhovich/prepared_statement_fix	Aaron Patterson	2012-05-25	1	-10/+10
\|\
\| *	Remove prepared statement from system query in postgresql adapter	Ivan Evtukhovich	2012-05-12	1	-10/+10
* \|	Merge pull request #5244 from fotos/myqsl2_wait_timeout	Rafael Mendonça França	2012-05-25	1	-1/+1
\|\ \
\| * \|	Maximum wait_timeout on Windows is 2147483	Fotos Georgiadis	2012-03-02	1	-1/+1
* \| \|	Merge pull request #6487 from avakhov/range-sum-optimization	Rafael Mendonça França	2012-05-25	2	-2/+11
\|\ \ \
\| * \| \|	Fix Range#sum optimized version	Alexey Vakhov	2012-05-25	2	-2/+11
\|/ / /
* \| \|	Merge pull request #4785 from ayamomiji/add-self-to-allow-method-name-using-r...	José Valim	2012-05-25	2	-4/+26
\|\ \ \
\| * \| \|	fix `alias_attribute` will raise a syntax error if make an alias on a	ayaya	2012-05-14	2	-4/+26
* \| \| \|	Remove implicit dependency on pathname	José Valim	2012-05-25	2	-4/+4
* \| \| \|	Merge pull request #6482 from waseem/fix_build_4008	José Valim	2012-05-24	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Fixes build 4008.1	Waseem Ahmad	2012-05-25	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #6481 from schneems/schneems/sextant-routes	Rafael Mendonça França	2012-05-24	1	-9/+0
\|\ \ \ \
\| * \| \| \|	remove unnecessary test from route_inspect_test	schneems	2012-05-24	1	-9/+0
* \| \| \| \|	do not set the ENGINE_PATH to nil	Aaron Patterson	2012-05-24	1	-1/+1
* \| \| \| \|	`name` should be public.	Aaron Patterson	2012-05-24	1	-12/+12
* \| \| \| \|	Add missing requires for deep_dup and hash ext test	Carlos Antonio da Silva	2012-05-24	2	-0/+3
* \| \| \| \|	Merge pull request #5925 from Juanmcuello/pg_structure_dump	Carlos Antonio da Silva	2012-05-24	1	-2/+2
* \| \| \| \|	Use deep_dup in the deep_transform_keys tests.	Rafael Mendonça França	2012-05-24	1	-20/+98
* \| \| \| \|	Merge pull request #6461 from schneems/schneems/sextant-routes	Andrew White	2012-05-24	10	-14/+104
\|\\| \| \| \|
\| * \| \| \|	Rails::InfoController tests passing	schneems	2012-05-24	3	-6/+32
\| * \| \| \|	/rails/info/routes path shows routing information	schneems	2012-05-24	7	-8/+72
\|/ / / /
* \| \| \|	Merge pull request #6471 from parndt/rails_root_should_be_join_able	José Valim	2012-05-24	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fixed backward incompatibility for engines.	Philip Arndt	2012-05-24	1	-1/+1
* \| \| \| \|	Merge pull request #6447 from chancancode/add_backporting_instructions_to_con...	Piotr Sarnacki	2012-05-23	1	-0/+29
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Added instructions for backporting changes to guides.	Godfrey Chan	2012-05-23	1	-0/+29
* \| \| \| \|	use File.join rather than depend on Pathname	Aaron Patterson	2012-05-23	1	-1/+1
* \| \| \| \|	Revert "require the constants we use. ensure that root always returns a Pathn...	Aaron Patterson	2012-05-23	1	-2/+1
* \| \| \| \|	require the constants we use. ensure that root always returns a Pathname	Aaron Patterson	2012-05-23	1	-1/+2
* \| \| \| \|	removing more pathnameisms	Aaron Patterson	2012-05-23	2	-6/+4
* \| \| \| \|	use File.join to decrease dependencies on Pathname	Aaron Patterson	2012-05-23	1	-1/+1
* \| \| \| \|	Merge pull request #6466 from markmcspadden/hash_deep_transform_keys	Rafael Mendonça França	2012-05-23	4	-19/+50
\|\ \ \ \ \
\| * \| \| \| \|	Add Hash#deep_transform_keys and Hash#deep_transform_keys! Also convert deep_...	Mark McSpadden	2012-05-23	4	-19/+50
* \| \| \| \| \|	Whitespaces :scissors:	Rafael Mendonça França	2012-05-23	2	-7/+7
* \| \| \| \| \|	PGconn doesn't accepts :checkout_timeout option.	Rafael Mendonça França	2012-05-23	1	-1/+1
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-05-23	10	-78/+554
\|\ \ \ \ \
\| * \| \| \| \|	copy edits in collection proxy docs [ci skip]	Vijay Dev	2012-05-23	1	-25/+18
\| * \| \| \| \|	Revert "Remove Obsolute root specifiying short syntax"	Vijay Dev	2012-05-23	1	-0/+1
\| * \| \| \| \|	Revert "Remove blank trailing comments"	Vijay Dev	2012-05-23	105	-0/+192
\| * \| \| \| \|	copy edit[ci skip]	Vijay Dev	2012-05-23	1	-1/+1
\| * \| \| \| \|	[Guides] Fix sample code	Oscar Del Ben	2012-05-23	1	-1/+1
\| * \| \| \| \|	[Guides] Rewrite server start section	Oscar Del Ben	2012-05-23	1	-8/+23
\| * \| \| \| \|	[Guides] Rewrite server start section	Oscar Del Ben	2012-05-23	1	-2/+20
\| * \| \| \| \|	Fix incorrect example for fields_for - without the '=' it will not output any...	David Morton	2012-05-22	1	-1/+1
\| * \| \| \| \|	clarified how file naming affects load order of initializers	Rory O’Kane	2012-05-22	1	-1/+1
\| * \| \| \| \|	add CollectionProxy#length documentation	Francesco Rodriguez	2012-05-22	1	-5/+37
\| * \| \| \| \|	add CollectionProxy#size documentation	Francesco Rodriguez	2012-05-22	1	-2/+25
\| * \| \| \| \|	add :call-seq: to +first+ and +last+ CollectionProxy methods	Francesco Rodriguez	2012-05-22	1	-0/+6
\| * \| \| \| \|	add CollectionProxy#create! documentation	Francesco Rodriguez	2012-05-22	1	-0/+22