This project is archived and is in readonly mode.
Changeset [efba1d4227514a6ce4880910a6531b0a6c3c75aa] by Xavier Noria
May 1st, 2010 @ 10:23 AM
Merge commit 'rails/master'
Conflicts:
railties/guides/source/index.html.erb
http://github.com/rails/rails/commit/efba1d4227514a6ce4880910a6531b...
Committed by Xavier Noria
- A actionmailer/lib/rails/generators/mailer/USAGE
- A actionmailer/lib/rails/generators/mailer/mailer_generator.rb
- A actionmailer/lib/rails/generators/mailer/templates/mailer.rb
- A actionpack/test/controller/http_token_authentication_test.rb
- A activerecord/test/cases/transaction_callbacks_test.rb
- A railties/lib/rails/commands/benchmarker.rb
- A railties/lib/rails/commands/profiler.rb
- A railties/test/application/model_initialization_test.rb
- A railties/test/fixtures/lib/empty_builder.rb
- A railties/test/fixtures/lib/simple_builder.rb
- A railties/test/fixtures/lib/tweak_builder.rb
- R railties/lib/rails/commands/performance/benchmarker.rb
- R railties/lib/rails/commands/performance/profiler.rb
- R railties/lib/rails/generators/rails/mailer/USAGE
- R railties/lib/rails/generators/rails/mailer/mailer_generator.rb
- R railties/lib/rails/generators/rails/mailer/templates/mailer.rb
- M actionpack/CHANGELOG
- M actionpack/lib/action_controller/base.rb
- M actionpack/lib/action_controller/caching/actions.rb
- M actionpack/lib/action_controller/metal/http_authentication.rb
- M actionpack/lib/action_dispatch/middleware/show_exceptions.rb
- M actionpack/lib/action_dispatch/routing/route_set.rb
- M actionpack/lib/action_view/helpers/date_helper.rb
- M actionpack/lib/action_view/helpers/url_helper.rb
- M actionpack/test/controller/caching_test.rb
- M actionpack/test/controller/rescue_test.rb
- M actionpack/test/dispatch/routing_test.rb
- M actionpack/test/template/date_helper_test.rb
- M actionpack/test/template/form_tag_helper_test.rb
- M actionpack/test/template/url_helper_test.rb
- M activemodel/lib/active_model/serializers/xml.rb
- M activemodel/lib/active_model/validations.rb
- M activemodel/lib/active_model/validations/acceptance.rb
- M activemodel/test/cases/serializeration/xml_serialization_test.rb
- M activemodel/test/models/contact.rb
- M activerecord/CHANGELOG
- M activerecord/lib/active_record/associations.rb
- M activerecord/lib/active_record/base.rb
- M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
- M activerecord/lib/active_record/migration.rb
- M activerecord/lib/active_record/railtie.rb
- M activerecord/lib/active_record/relation/finder_methods.rb
- M activerecord/lib/active_record/relation/query_methods.rb
- M activerecord/lib/active_record/serializers/xml_serializer.rb
- M activerecord/lib/active_record/transactions.rb
- M activerecord/lib/rails/generators/active_record.rb
- M activerecord/test/cases/associations/cascaded_eager_loading_test.rb
- M activerecord/test/cases/base_test.rb
- M activerecord/test/cases/migration_test.rb
- M activerecord/test/cases/serialization_test.rb
- M activerecord/test/cases/transactions_test.rb
- M activerecord/test/cases/xml_serialization_test.rb
- M activerecord/test/models/author.rb
- M activerecord/test/models/contact.rb
- M activesupport/CHANGELOG
- M activesupport/activesupport.gemspec
- M activesupport/lib/active_support/cache/strategy/local_cache.rb
- M activesupport/lib/active_support/core_ext/array/conversions.rb
- M activesupport/lib/active_support/core_ext/hash/conversions.rb
- M activesupport/lib/active_support/inflector/transliterate.rb
- M activesupport/lib/active_support/multibyte/chars.rb
- M activesupport/lib/active_support/xml_mini.rb
- M activesupport/test/core_ext/array_ext_test.rb
- M activesupport/test/transliterate_test.rb
- M railties/guides/source/generators.textile
- M railties/guides/source/index.html.erb
- M railties/lib/rails/application.rb
- M railties/lib/rails/application/bootstrap.rb
- M railties/lib/rails/application/configuration.rb
- M railties/lib/rails/commands.rb
- M railties/lib/rails/commands/runner.rb
- M railties/lib/rails/configuration.rb
- M railties/lib/rails/engine.rb
- M railties/lib/rails/generators/base.rb
- M railties/lib/rails/generators/rails/app/app_generator.rb
- M railties/lib/rails/generators/rails/app/templates/script/rails
- M railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt
- M railties/lib/rails/railtie.rb
- M railties/railties.gemspec
- M railties/test/application/middleware_test.rb
- M railties/test/application/paths_test.rb
- M railties/test/application/rake_test.rb
- M railties/test/generators/actions_test.rb
- M railties/test/generators/app_generator_test.rb
- M railties/test/generators/mailer_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>