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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote branch 'mainstream/master'	Pratik Naik	2010-02-01	4	-8/+13
\|\
\| *	Merge branch 'master' of gitproxy:rails/rails	José Valim	2010-02-01	1	-3/+4
\| \|\
\| \| *	Convert to class_attribute	Jeremy Kemper	2010-02-01	1	-3/+4
\| * \|	Deprecate AC configuration values which were moved to Rack.	José Valim	2010-02-01	2	-4/+6
\| * \|	Add config.generators.fallbacks.	José Valim	2010-02-01	2	-1/+3
\| \|/
* \|	Merge remote branch 'mainstream/master'	Pratik Naik	2010-01-31	8	-32/+28
\|\\|
\| *	Improve railtie deprecation messages.	José Valim	2010-01-30	1	-10/+10
\| *	tsort-based dependency resolution for initializers	Paul Rosania	2010-01-29	2	-18/+13
\| *	Only load testing tasks if test unit is being used.	José Valim	2010-01-29	2	-2/+2
\| *	Automatically configure generators if application is defined.	José Valim	2010-01-29	3	-2/+3
* \|	Merge remote branch 'mainstream/master'	Pratik Naik	2010-01-28	35	-799/+1045
\|\\|
\| *	Move the ActiveRecord generator settings into the Railtie	Carl Lerche	2010-01-28	1	-6/+1
\| *	Add more tests to some key points in Railties.	José Valim	2010-01-28	1	-0/+4
\| *	Add reloadable specific for engines and move environment to application paths.	José Valim	2010-01-28	4	-7/+11
\| *	Add config.to_prepare back and add tests for it.	José Valim	2010-01-28	2	-1/+15
\| *	Refactor MetalLoader and RoutesReloader to rely less on class configuration.	José Valim	2010-01-28	6	-35/+40
\| *	Cleanup the test_unit generator move into the railtie	Carl Lerche	2010-01-28	2	-8/+9
\| *	Fix the test_framework generator tests	Carl Lerche	2010-01-28	2	-0/+3
\| *	Test::Unit Railtie	Carlhuda	2010-01-28	4	-3/+13
\| *	Clean up Rails::Rack::Logger.	José Valim	2010-01-26	1	-11/+7
\| *	Move Rails::Rack::Metal to Rails::Application::Metal and just add cascade if ...	José Valim	2010-01-26	5	-4/+9
\| *	Middleware stack actually runs routes and not the application.	José Valim	2010-01-26	1	-1/+1
\| *	Add tests for explicit engines.	José Valim	2010-01-26	3	-13/+21
\| *	Ensure app does not show up in generators.	José Valim	2010-01-26	1	-0/+1
\| *	Ensure proper class is shown on rake middleware.	José Valim	2010-01-26	1	-1/+1
\| *	Ensure calling a method in Rails::Application does not instantiate a void app...	José Valim	2010-01-26	1	-3/+3
\| *	Merge remote branch 'mikel/master'	José Valim	2010-01-26	2	-65/+57
\| \|\
\| \| *	Change mailer generator templates and refactor the whole naming schema.	José Valim and Mikel Lindsaar	2010-01-25	2	-65/+57
\| * \|	Ensure all initializers are collections.	José Valim	2010-01-26	4	-35/+36
\| * \|	As first step setup the load path and lazy compare middlewares.	José Valim	2010-01-25	2	-2/+6
\| * \|	Fix i18n locales order test.	José Valim	2010-01-25	1	-7/+9
\| * \|	Plugins need to load before app initializers	Joshua Peek	2010-01-25	1	-1/+1
\| * \|	Add active_model/railtie back to generated boot.rb, add models back to paths,...	José Valim	2010-01-25	1	-0/+1
\| \|/
\| *	Revamp of Rails documentation task	Rizwan Reza	2010-01-24	1	-23/+31
\| *	Fix a couple failures on 1.9.1.	José Valim	2010-01-24	2	-5/+7
\| *	Add Rails::Application pointer to the default app to add symmetry to Foo::App...	Joshua Peek	2010-01-24	2	-2/+6
\| *	Ensure metals and initializers in plugins are loaded.	José Valim	2010-01-24	6	-24/+43
\| *	Add tests for plugin sanity check.	José Valim	2010-01-24	2	-3/+3
\| *	Rename plugin_name to railtie_name and engine_name.	José Valim	2010-01-24	3	-15/+11
\| *	Ensure environment config has higher priority than application ones.	José Valim	2010-01-24	2	-2/+4
\| *	Ensure helpers work from configured path.	José Valim	2010-01-24	2	-2/+1
\| *	Ensure namespaced controllers in engines work.	José Valim	2010-01-24	2	-0/+11
\| *	Load deprecated tasks for plugins.	José Valim	2010-01-24	1	-0/+11
\| *	Solve some pendencies.	José Valim	2010-01-24	7	-25/+33
\| *	Move console stuff to its own directory.	José Valim	2010-01-23	4	-4/+4
\| *	Move configuration to subfolders.	José Valim	2010-01-23	11	-218/+243
\| *	Create configurable modules and ensure that they are added only on direct chi...	José Valim	2010-01-23	6	-81/+128
\| *	Plugin is now an Engine.	José Valim	2010-01-23	4	-60/+45
\| *	First steps into making Plugin < Engine.	José Valim	2010-01-23	4	-11/+29
\| *	Extract Railtie load from application.	José Valim	2010-01-23	6	-46/+83