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

	Commit message (Collapse)	Author	Age	Files	Lines
*	add note about AR#include_root_in_json default in Upgrading Rails guide [ci ↵	Francesco Rodriguez	2012-09-21	1	-1/+15
\| \| \| \|	skip]
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-09-21	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes.
*	Convert all the links into Markdown format	Prem Sichanugrist	2012-09-17	1	-3/+3
\|
*	Convert all inline codes to Markdown syntax	Prem Sichanugrist	2012-09-17	1	-8/+4
\|
*	Convert inline code tags to Markdown	Prem Sichanugrist	2012-09-17	1	-14/+18
\|
*	Convert heading tags and heading section	Prem Sichanugrist	2012-09-17	1	-25/+30
\|
*	Convert code blocks into GFM style	Prem Sichanugrist	2012-09-17	1	-20/+20
\|
*	Rename the rest of the guides to Markdown	Prem Sichanugrist	2012-09-17	1	-0/+230