rails

mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00

Files

Yehuda Katz 3030bc90c9 Merge commit 'rails/3-0-unstable'

Conflicts:

	actionpack/lib/action_controller/base.rb
	actionpack/lib/action_dispatch/http/mime_type.rb
	actionpack/lib/action_dispatch/http/request.rb
	actionpack/lib/action_view/base.rb
	actionpack/lib/action_view/paths.rb
	actionpack/test/controller/session/cookie_store_test.rb
	actionpack/test/dispatch/rack_test.rb
	actionpack/test/dispatch/request_test.rb

2009-01-30 11:30:27 -08:00

erb

use autoload instead of explicit requires for ActionView

2008-11-23 13:42:07 -06:00

helpers

Merge commit 'rails/3-0-unstable'

2009-01-30 11:30:27 -08:00

locale

Improve i18n support for number_to_human_size helper:

2009-01-27 09:22:00 -08:00

render

Reorganize ActionController folder structure