rails

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

Go to file

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

actionmailer

Begin unifying the interface between ActionController and ActionView

2009-01-22 16:18:10 -06:00

actionpack

Merge commit 'rails/3-0-unstable'

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

activemodel

Merge with docrails

2008-12-07 03:27:53 +01:00

activerecord

Merge commit 'rails/3-0-unstable'