Pratik Naik 285361d158 Merge remote branch 'mainstream/master' ...

Conflicts:
	railties/lib/rails/railtie.rb

2010-01-28 19:46:17 +00:00

..

abstract_controller

Bring layouts with proc back alive.

2010-01-26 16:34:25 +01:00

action_controller

AC railtie should configure helpers path.

2010-01-26 21:05:50 +01:00

action_dispatch

Ensure root routes inside optional scopes works as expected.

2010-01-26 00:55:26 +01:00

action_pack

Bump up the version to 3.0.pre

2009-06-30 14:37:12 -07:00

action_view

Merge remote branch 'mainstream/master'

2010-01-28 19:46:17 +00:00

abstract_controller.rb

Added AbstractController::Collector.

2010-01-23 10:23:06 +01:00

action_controller.rb

Tidy up new filter_parameters implementation.

2010-01-21 11:57:24 +01:00

action_dispatch.rb

Default to sync instrumentation.

2010-01-21 13:09:12 +01:00

action_pack.rb

Bump up the year in MIT license files

2009-01-18 05:28:21 +00:00

action_view.rb

Autoload AC and AV test case classes

2010-01-04 16:22:46 -06:00