Pratik Naik 53744c5438 Merge commit 'mainstream/master' ...

Conflicts:
	actionpack/lib/action_view/helpers/text_helper.rb
	activesupport/lib/active_support/inflector.rb

2009-03-12 15:31:24 +00:00

..

action_controller

Merge commit 'mainstream/master'

2009-03-12 15:31:24 +00:00

action_pack

Prep for RC2 later today

2009-02-27 14:46:23 +01:00

action_view

Merge commit 'mainstream/master'

2009-03-12 15:31:24 +00:00

action_controller.rb

check for rack 1.0 gem before falling back to bundled version

2009-03-10 15:09:44 -05:00

action_pack.rb

Bump up the year in MIT license files

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

action_view.rb

Port fast reloadable templates from rails-dev-boost.

2009-02-12 13:04:12 -06:00

actionpack.rb

Allow frameworks to be required by their gem name (closes #8845) [drnic]

2007-09-22 18:15:05 +00:00