github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,989 Commits 34 Branches 105 Tags
6faff0223b4470a6c1c66664f1b3df94de206841
Commit Graph

3 Commits

Author SHA1 Message Date
Yehuda Katz
44cdf0c5fe Some merge cleanup 2009-02-02 09:54:23 -08:00
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
Joshua Peek
85750f22c9 Move dispatch related tests into test/dispatch 2009-01-28 22:50:46 -06:00