rails--rails/ci
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
..
ci_build.rb Update CI configuration to reflect latest gems. 2009-01-07 16:59:06 +13:00
ci_setup_notes.txt Update CI configuration to reflect latest gems. 2009-01-07 16:59:06 +13:00
cruise_config.rb Spam people with commit rights on test failures. 2009-01-07 18:18:00 +13:00
geminstaller.yml Move to use pg instead of postgres on the CI server 2009-01-29 17:07:29 +13:00
site.css Include the CI configuration and setup instructions. 2008-08-24 16:27:20 +02:00
site_config.rb Include the CI configuration and setup instructions. 2008-08-24 16:27:20 +02:00