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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit 'mainstream/master'	Pratik Naik	2008-12-07	4	-1/+321
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: actionmailer/lib/action_mailer/base.rb actionpack/lib/action_controller/base.rb actionpack/lib/action_controller/mime_type.rb railties/doc/guides/html/activerecord_validations_callbacks.html railties/doc/guides/html/caching_with_rails.html railties/doc/guides/html/command_line.html railties/doc/guides/html/configuring.html railties/doc/guides/html/creating_plugins.html railties/doc/guides/html/finders.html railties/doc/guides/html/routing_outside_in.html railties/doc/guides/source/activerecord_validations_callbacks.txt railties/doc/guides/source/caching_with_rails.txt railties/doc/guides/source/command_line.txt railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt railties/doc/guides/source/creating_plugins/controllers.txt railties/doc/guides/source/creating_plugins/core_ext.txt railties/doc/guides/source/creating_plugins/helpers.txt railties/doc/guides/source/creating_plugins/index.txt railties/doc/guides/source/creating_plugins/migration_generator.txt railties/doc/guides/source/creating_plugins/models.txt railties/doc/guides/source/creating_plugins/odds_and_ends.txt railties/doc/guides/source/creating_plugins/routes.txt railties/doc/guides/source/finders.txt railties/doc/guides/source/routing_outside_in.txt railties/doc/guides/source/testing_rails_applications.txt
\| *	Merge docrails.	Pratik Naik	2008-11-14	16	-1447/+793
\| \|
\| *	Merge with docrails. Also add a rake task to generate guides in your rails ↵	Pratik Naik	2008-10-21	11	-0/+1866
\| \| \| \| \| \| \| \|	application : rake doc:guides The rake task will generate guides inside doc/guides directory of your application. Open index.html to browse.
*	Plugin guide: Edits	Jeff Dean	2008-11-17	3	-10/+6
\|
*	Rails plugin: misc error fixes.	Jeff Dean	2008-11-17	10	-54/+85
\|
*	Rails guide: Misc reorganization	Jeff Dean	2008-11-16	5	-30/+28
\|
*	Rails guide: Added PluginGem section, reorganized the odds and ends.	Jeff Dean	2008-11-16	9	-81/+126
\|
*	Plugin Guide: added section on migrations, updated generator section, ↵	Jeff Dean	2008-11-16	15	-352/+577
\| \| \| \|	tightened up spacing of P's inside LI's
*	Plugin guide: updated to start working with GemPlugin	Jeff Dean	2008-11-14	3	-4/+5
\|
*	Rails plugin: Expanded helpers section	Jeff Dean	2008-11-14	3	-62/+52
\|
*	Plugin guide: added model and controller sections	Jeff Dean	2008-11-14	6	-27/+146
\|
*	Plugin Guide: updated test setup and generator sections	Jeff Dean	2008-11-14	3	-19/+37
\|
*	Plugin guide: update generator guide to include tests	Jeff Dean	2008-11-13	4	-916/+127
\|
*	Plugin guide: update acts_as section	Jeff Dean	2008-11-13	3	-108/+97
\|
*	Plugin Guide: updated core_extensions section	Jeff Dean	2008-11-13	5	-138/+128
\|
*	Plugin Guide: cleaned up file paths, made formatting more consistent	Jeff Dean	2008-11-12	7	-54/+62
\|
*	Plugins guide: Cleanup the intro	Jeff Dean	2008-11-12	1	-62/+26
\|
*	Plugins Guide: added example of how to run tests, including how to run with ↵	Jeff Dean	2008-11-12	1	-0/+58
\| \| \| \|	multiple databases
*	Updated preparation section of plugins guide	Jeff Dean	2008-11-12	2	-35/+33
\|
*	Rearrange guides	Pratik Naik	2008-10-21	11	-0/+1866