Jeremy Kemper 636e6b7138 Merge branch 'master' into i18n-merge ...

Conflicts:

	actionpack/lib/action_view/helpers/form_options_helper.rb
	activerecord/lib/active_record/validations.rb

2008-07-17 11:52:56 -07:00

..

action_controller

All 2xx requests are considered successful [#217 state:resolved]

2008-07-16 19:49:46 -05:00

action_pack

Making ready for release of 2.1

2008-05-31 17:03:03 -07:00

action_view

Merge branch 'master' into i18n-merge

2008-07-17 11:52:56 -07:00

action_controller.rb

Added Rack processor

2008-06-01 11:25:11 -07:00

action_pack.rb

Updated copyright years

2008-05-11 18:34:05 -05:00

action_view.rb

merge forward to current rails/master

2008-07-16 03:41:11 +02:00

actionpack.rb

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

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