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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-10-11	1	-4/+43
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
\| *	Correct and clarify `--full` and `--mountable` options to `rails plugin new`	Corey Innis	2012-10-07	1	-4/+43
\| \|
\| *	updates latest Rails version number	Fabrizio Regini	2012-09-30	1	-1/+1
\| \|
* \|	Update test locations	Mike Moore	2012-10-09	1	-9/+9
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \|	Change the default test locations to avoid confusion around the common testing terms "unit" and "functional". Add new rake tasks for the new locations, while maintaining backwards compatibility with the old rake tasks. New testing locations are as follows: app/models -> test/models (was test/units) app/helpers -> test/helpers (was test/units/helpers) app/controllers -> test/controllers (was test/functional) app/mailers -> test/mailers (was test/functional)
*	Fix typos and links in engines guide [ci skip]	Vijay Dev	2012-09-21	1	-3/+2
\|
*	Fix broken and duplicate headings	Prem Sichanugrist	2012-09-17	1	-2/+2
\|
*	Fix the usage of `*` in Markdown	Prem Sichanugrist	2012-09-17	1	-5/+5
\| \| \| \| \|	In Textile `` would convert to `<strong>`, but in Markdown we have to use `*` instead.
*	Fix remaining formatting problems in the guide	Prem Sichanugrist	2012-09-17	1	-12/+12
\|
*	Convert all the links into Markdown format	Prem Sichanugrist	2012-09-17	1	-7/+7
\|
*	Convert all inline codes to Markdown syntax	Prem Sichanugrist	2012-09-17	1	-133/+133
\|
*	change shell to bash	Prem Sichanugrist	2012-09-17	1	-19/+19
\|
*	Convert inline code tags to Markdown	Prem Sichanugrist	2012-09-17	1	-2/+2
\|
*	Convert heading tags and heading section	Prem Sichanugrist	2012-09-17	1	-32/+39
\|
*	Convert code blocks into GFM style	Prem Sichanugrist	2012-09-17	1	-150/+150
\|
*	Rename the rest of the guides to Markdown	Prem Sichanugrist	2012-09-17	1	-0/+905