Pratik Naik b04230e3bb Merge remote branch 'mainstream/master' ...

Conflicts:
	actionpack/lib/action_controller/metal/flash.rb

2010-01-17 03:20:30 +05:30

..

http

Split ActionDispatch http in smaller chunks.

2010-01-16 15:45:07 +01:00

middleware

Fix const reference for SessionRestoreError

2010-01-15 16:20:12 -06:00

routing

Allow custom controller for resource(s) [#3703 state:resolved]

2010-01-16 15:16:22 -06:00

testing

Merge remote branch 'mainstream/master'

2010-01-17 03:20:30 +05:30

routing.rb

Merge remote branch 'mainstream/master'

2010-01-04 03:24:39 +05:30