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

	Commit message (Expand)	Author	Age	Files	Lines
*	remove deprecated #first calls	Jon Leighton	2012-04-26	3	-28/+3
*	remove deprecate #calculate calls	Jon Leighton	2012-04-26	11	-146/+72
*	remove deprecated #find_in_batches calls	Jon Leighton	2012-04-26	2	-15/+3
*	Merge pull request #5997 from avakhov/test_namespaced_controller_dont_indent_...	Xavier Noria	2012-04-26	1	-3/+4
\|\
\| *	Namedspaced generator indent method test refactoring	Alexey Vakhov	2012-04-26	1	-3/+4
* \|	Merge pull request #5998 from aderyabin/fix7	Xavier Noria	2012-04-26	2	-24/+25
\|\ \ \| \|/ \|/\|
\| *	EXPLAIN only for sqlite3	Andrey Deryabin	2012-04-26	2	-24/+25
\|/
*	Merge pull request #5995 from kennyj/fix_5847-3	Jon Leighton	2012-04-26	2	-0/+27
\|\
\| *	Fix #5847 and #4045. Load AR::Base before loading an application model.	kennyj	2012-04-26	2	-0/+27
* \|	remove deprecate #update_all usage	Jon Leighton	2012-04-26	4	-12/+6
* \|	fix #scoped deprecations	Jon Leighton	2012-04-26	4	-15/+16
* \|	remove deprecated scope stuff	Jon Leighton	2012-04-26	5	-54/+2
* \|	default_scope with a hash is deprecated	Jon Leighton	2012-04-26	1	-10/+0
\|/
*	fix number_to_human docs [ci skip]	Vijay Dev	2012-04-26	1	-2/+2
*	Routes reloader knows how to reload external files	Yehuda Katz	2012-04-25	3	-4/+73
*	Fix missing Rails.env in route inspect tests	Yehuda Katz	2012-04-25	1	-0/+1
*	Fix the build	Yehuda Katz	2012-04-25	2	-2/+3
*	Make files in paths consistent	Yehuda Katz	2012-04-25	1	-1/+1
*	Allow loading external route files from the router	Jose and Yehuda	2012-04-25	9	-3/+79
*	remove unused method	Jon Leighton	2012-04-25	1	-6/+0
*	remove tests for #with_scope (it's now deprecated)	Jon Leighton	2012-04-25	13	-767/+6
*	Merge pull request #5973 from academia-edu/master	Aaron Patterson	2012-04-25	2	-3/+10
\|\
\| *	Restore .to_s to escape_hstore	Ryan Fitzgerald	2012-04-24	1	-1/+1
\| *	Always quote hstore keys and values	Ryan Fitzgerald	2012-04-24	2	-3/+10
* \|	Merge remote-tracking branch 'jmbejar/define_array_methods_collection_proxy'	Jon Leighton	2012-04-25	1	-0/+13
\|\ \
\| * \|	Define array methods in ActiveRecord::Associations::CollectionProxy	Jorge Bejar	2012-04-18	1	-0/+13
* \| \|	Merge remote-tracking branch 'kennyj/fix_5563'	Jon Leighton	2012-04-25	5	-4/+17
\|\ \ \
\| * \| \|	Fix #5563. Should reflect the most recent change to either of association / id.	kennyj	2012-04-13	2	-1/+13
\| * \| \|	@stale_state should be nil when a model isn't saved.	kennyj	2012-04-13	3	-3/+4
* \| \| \|	add missing test	Jon Leighton	2012-04-25	1	-0/+12
* \| \| \|	extract #with_scope and #with_exclusive_scope to active_record_deprecated_fin...	Jon Leighton	2012-04-25	2	-122/+4
* \| \| \|	extract deprecated code	Jon Leighton	2012-04-25	3	-11/+4
* \| \| \|	Extract deprecated code	Jon Leighton	2012-04-25	2	-9/+13
* \| \| \|	fix interpolation for hash merging	Jon Leighton	2012-04-25	3	-24/+39
* \| \| \|	allow merging a single where value	Jon Leighton	2012-04-25	2	-1/+7
* \| \| \|	extract to active_record_deprecated_finders	Jon Leighton	2012-04-25	1	-6/+5
* \| \| \|	giving a hash to default scope should not be deprecated (well, not for this r...	Jon Leighton	2012-04-25	2	-3/+3
* \| \| \|	Remove blank line at the end of routes.rb	Jeremy Kemper	2012-04-25	1	-2/+1
* \| \| \|	Merge pull request #5902 from avakhov/generator-no-indent-blank-lines	José Valim	2012-04-25	2	-1/+9
\|\ \ \ \
\| * \| \| \|	Don't indent blank lines in named base generators	Alexey Vakhov	2012-04-25	2	-1/+9
* \| \| \| \|	Merge pull request #5878 from oscardelben/refactor_observed_class	Vijay Dev	2012-04-25	1	-5/+2
\|\ \ \ \ \
\| * \| \| \| \|	Refactor Observer.observed_class	Oscar Del Ben	2012-04-25	1	-5/+2
\| \|/ / / /
* \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-25	20	-44/+242
\|\ \ \ \ \
\| * \| \| \| \|	copy edits [ci skip]	Vijay Dev	2012-04-25	2	-2/+2
\| * \| \| \| \|	Revert "Added warning that require_tree includes files in unspecified order. ...	Vijay Dev	2012-04-25	1	-7/+2
\| * \| \| \| \|	removing changes made in ccd0b511c933d3e2c7f3e345622ad2cc17728de5 and 189a172...	Vijay Dev	2012-04-25	1	-2/+0
\| * \| \| \| \|	Add partials explanation to getting started guide	Oscar Del Ben	2012-04-25	1	-0/+31
\| * \| \| \| \|	Add screenshot to updating post section	Oscar Del Ben	2012-04-25	2	-1/+6
\| * \| \| \| \|	fix code syntax	Oscar Del Ben	2012-04-25	1	-2/+2
\| * \| \| \| \|	Add include documentation to serialization	Oscar Del Ben	2012-04-25	1	-1/+6