This project is archived and is in readonly mode.
Changeset [9c70442534c7754eac3738e0ddf11446b01c4f9e] by Emilio Tagua
June 30th, 2009 @ 11:34 PM
Merge commit 'rails/master'
Conflicts:
activerecord/test/cases/adapter_test.rb
http://github.com/rails/rails/commit/9c70442534c7754eac3738e0ddf114...
Committed by Emilio Tagua
- A actionpack/lib/action_controller/testing/performance_test.rb
- A actionpack/test/fixtures/public/.gitignore
- A actionpack/test/fixtures/public/elsewhere/cools.js
- A actionpack/test/fixtures/public/elsewhere/file.css
- A actionpack/test/fixtures/public/javascripts/common.javascript
- A actionpack/test/fixtures/public/stylesheets/random.styles
- A railties/lib/initializer_old.rb
- A railties/lib/rails/configuration.rb
- A railties/lib/rails/core.rb
- A railties/test/new_initializer_test.rb
- R actionpack/lib/action_controller/testing/performance.rb
- M actionpack/lib/action_controller/base/streaming.rb
- M actionpack/lib/action_view/helpers/asset_tag_helper.rb
- M actionpack/lib/action_view/render/partials.rb
- M actionpack/lib/action_view/template/handlers/builder.rb
- M actionpack/lib/action_view/template/handlers/erb.rb
- M actionpack/test/controller/render_test.rb
- M actionpack/test/controller/send_file_test.rb
- M actionpack/test/template/asset_tag_helper_test.rb
- M activerecord/lib/active_record/base.rb
- M activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
- M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
- M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
- M activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
- M activerecord/test/cases/adapter_test.rb
- M activesupport/lib/active_support/cache.rb
- M railties/lib/initializer.rb
- M railties/lib/performance_test_help.rb
- M railties/lib/rails/plugin/loader.rb
- M railties/test/generator_lookup_test.rb
- M railties/test/initializer_test.rb
- M railties/test/plugin_loader_test.rb
- M railties/test/plugin_locator_test.rb
- M railties/test/plugin_test.rb
- M railties/test/rails_generator_test.rb
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
<h2 style="font-size: 14px">Tickets have moved to Github</h2>
The new ticket tracker is available at <a href="https://github.com/rails/rails/issues">https://github.com/rails/rails/issues</a>