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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-12-29	3	-11/+4
\|\
\| *	typo	Jo Liss	2011-12-28	1	-1/+1
\| *	Document that index names are made up of all columns, not just the first.	Jo Liss	2011-12-27	1	-9/+2
\| *	Remove unnecessary comma.	Uģis Ozols	2011-12-26	1	-1/+1
* \|	Deprecate implicit eager loading. Closes #950.	Jon Leighton	2011-12-29	6	-5/+19
* \|	Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids	Aaron Patterson	2011-12-28	1	-1/+1
\|\ \
\| * \|	allow reorder to affect eager loading correctly	Matt Jones + Scott Walker	2011-12-28	1	-1/+1
* \| \|	app code in general wants Time.current, not Time.now	Xavier Noria	2011-12-28	1	-3/+3
* \| \|	Merge pull request #4222 from amatsuda/ar_predicate_builder_refactor	Aaron Patterson	2011-12-28	1	-35/+37
\|\ \ \
\| * \| \|	refactor AR::PredicateBuilder.build_from_hash	Akira Matsuda	2011-12-29	1	-35/+37
* \| \| \|	Delete some stray lines	Jon Leighton	2011-12-28	2	-3/+0
\|/ / /
* \| \|	Avoid deprecation warning	Jon Leighton	2011-12-28	1	-1/+1
* \| \|	Support establishing connection on ActiveRecord::Model.	Jon Leighton	2011-12-28	16	-216/+220
* \| \|	Support configuration on ActiveRecord::Model.	Jon Leighton	2011-12-28	19	-181/+190
* \| \|	Merge pull request #4213 from amatsuda/ar_where_array_of_nil_and_a_value	Jon Leighton	2011-12-28	1	-2/+5
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	where(foo: [1, nil]) becomes "WHERE foo = 1 OR foo IS NULL"	Akira Matsuda	2011-12-28	1	-1/+4
\| * \|	no need to compact an already compacted Array	Akira Matsuda	2011-12-28	1	-1/+1
* \| \|	Merge pull request #4153 from alexeymuranov/my_fix_for_prefix_suffix_fixtures...	Jon Leighton	2011-12-28	1	-2/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Use the correct table name from fixture	Alexey Muranov	2011-12-28	1	-2/+2
\| \|/
* /	Revert "This conditions is required to work with database create task. 1.9.2 ...	Arun Agrawal	2011-12-27	1	-2/+1
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-12-25	1	-3/+3
\|\
\| *	Clarify what persisted? returns.	Uģis Ozols	2011-12-25	1	-2/+2
\| *	Remove extra 'be'.	Uģis Ozols	2011-12-25	1	-1/+1
* \|	remove checks for encodings availability	Sergey Nartimov	2011-12-25	2	-47/+43
* \|	Intercept sends in Model::DeprecationProxy	Jon Leighton	2011-12-24	1	-0/+2
* \|	deprecate String#encoding_aware? and remove its usage	Sergey Nartimov	2011-12-24	1	-17/+9
* \|	Fix position of load hook so that Base has been defined and included Model be...	Jon Leighton	2011-12-24	2	-3/+6
* \|	Add some doc for ActiveRecord::Model	Jon Leighton	2011-12-24	1	-0/+7
* \|	Add deprecation for the change to the active_record load hook	Jon Leighton	2011-12-24	1	-1/+24
* \|	Support nested AR::Models	Jon Leighton	2011-12-24	1	-1/+1
* \|	auto_explain_threshold_in_seconds should be a global config option so it can ...	Jon Leighton	2011-12-24	1	-8/+3
* \|	Don't include anything else if AR::Model has already been included	Jon Leighton	2011-12-24	1	-0/+2
* \|	Make PredicateBuilder recognise AR::Model	Jon Leighton	2011-12-24	1	-2/+2
* \|	Ensure attribute methods are included after all the AR stuff	Jon Leighton	2011-12-24	2	-2/+2
* \|	Fix #exists? for AR::Model	Jon Leighton	2011-12-24	1	-1/+1
* \|	Make generated_feature_methods work with ActiveRecord::Model	Jon Leighton	2011-12-24	1	-4/+9
* \|	Fixtures support for ActiveRecord::Model	Jon Leighton	2011-12-24	1	-1/+1
* \|	Deal with global config better between AR::Base and AR::Model	Jon Leighton	2011-12-24	9	-83/+111
* \|	Extract common logic into a method	Jon Leighton	2011-12-24	5	-28/+30
* \|	I herd you like modules.	Jon Leighton	2011-12-24	11	-70/+99
* \|	Start work towards making AR include-able.	Jon Leighton	2011-12-24	4	-369/+390
* \|	Tidy up migration types.	José Valim	2011-12-24	4	-11/+10
* \|	added ability to specify from cli when generating a model/migration whether p...	Dmitrii Samoilov	2011-12-24	4	-7/+16
* \|	Merge pull request #4149 from castlerock/remove_1.8_stuff	José Valim	2011-12-24	1	-7/+0
\|\ \
\| * \|	remove ruby 1.8 stuff skip hack from AR	Vishnu Atrai	2011-12-23	1	-7/+0
* \| \|	Fix situation where id method didn't get defined causing postgres to fail	Jon Leighton	2011-12-23	1	-4/+3
\| \|/ \|/\|
* \|	Doh, remove debugging line	Jon Leighton	2011-12-23	1	-1/+0
* \|	Fix #4046.	Jon Leighton	2011-12-23	2	-46/+36
\|/
*	Reconnect to the first database after db:create	Tsutomu Kuroda	2011-12-23	1	-0/+1
*	Fix build when IM=true	Jon Leighton	2011-12-22	1	-4/+3