This project is archived and is in readonly mode.
Changeset [952014315926d370f2a0b681cb765948bf2e6883] by Emilio Tagua
August 8th, 2009 @ 11:14 PM
Merge commit 'rails/master'
Conflicts:
activerecord/test/cases/adapter_test.rb
activerecord/test/cases/method_scoping_test.rb
http://github.com/rails/rails/commit/952014315926d370f2a0b681cb7659...
Committed by Emilio Tagua
- A actionpack/lib/abstract_controller/rendering_controller.rb
- A actionpack/lib/action_controller/metal/rendering_controller.rb
- A actionpack/lib/action_controller/metal/responder.rb
- A actionpack/test/fixtures/respond_with/edit.html.erb
- A actionpack/test/fixtures/respond_with/new.html.erb
- A actionpack/test/fixtures/respond_with/using_resource.js.rjs
- A railties/lib/generators/active_model.rb
- A railties/lib/vendor/thor-0.11.5/CHANGELOG.rdoc
- A railties/lib/vendor/thor-0.11.5/LICENSE
- A railties/lib/vendor/thor-0.11.5/README.rdoc
- A railties/lib/vendor/thor-0.11.5/bin/rake2thor
- A railties/lib/vendor/thor-0.11.5/bin/thor
- A railties/lib/vendor/thor-0.11.5/lib/thor.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/actions.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/actions/create_file.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/actions/directory.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/actions/empty_directory.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/actions/file_manipulation.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/actions/inject_into_file.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/base.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/core_ext/hash_with_indifferent_access.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/core_ext/ordered_hash.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/error.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/group.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/invocation.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/parser.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/parser/argument.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/parser/arguments.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/parser/option.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/parser/options.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/rake_compat.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/runner.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/shell.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/shell/basic.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/shell/color.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/task.rb
- A railties/lib/vendor/thor-0.11.5/lib/thor/util.rb
- A railties/test/fixtures/lib/template.rb
- A railties/test/fixtures/vendor/gems/gems/mspec/lib/generators/mspec_generator.rb
- A railties/test/fixtures/vendor/gems/gems/wrong/lib/generators/wrong_generator.rb
- R actionpack/lib/abstract_controller/renderer.rb
- R actionpack/lib/action_controller/metal/renderer.rb
- R actionpack/test/fixtures/respond_with/using_resource.html.erb
- R railties/lib/generators/action_orm.rb
- R railties/lib/vendor/thor-0.11.3/CHANGELOG.rdoc
- R railties/lib/vendor/thor-0.11.3/LICENSE
- R railties/lib/vendor/thor-0.11.3/README.markdown
- R railties/lib/vendor/thor-0.11.3/bin/rake2thor
- R railties/lib/vendor/thor-0.11.3/bin/thor
- R railties/lib/vendor/thor-0.11.3/lib/thor.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/actions.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/actions/create_file.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/actions/directory.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/actions/empty_directory.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/actions/file_manipulation.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/actions/inject_into_file.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/base.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/core_ext/hash_with_indifferent_access.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/core_ext/ordered_hash.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/error.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/group.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/invocation.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/parser.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/parser/argument.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/parser/arguments.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/parser/option.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/parser/options.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/runner.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/shell.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/shell/basic.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/shell/color.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/task.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/tasks.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/tasks/install.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/tasks/package.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/tasks/spec.rb
- R railties/lib/vendor/thor-0.11.3/lib/thor/util.rb
- R railties/test/fixtures/vendor/gems/mspec/lib/generators/mspec_generator.rb
- R railties/test/fixtures/vendor/gems/wrong/lib/generators/wrong_generator.rb
- M actionmailer/lib/action_mailer/base.rb
- M actionmailer/test/delivery_method_test.rb
- M actionmailer/test/mail_service_test.rb
- M actionpack/examples/very_simple.rb
- M actionpack/lib/abstract_controller.rb
- M actionpack/lib/abstract_controller/helpers.rb
- M actionpack/lib/abstract_controller/layouts.rb
- M actionpack/lib/action_controller.rb
- M actionpack/lib/action_controller/base.rb
- M actionpack/lib/action_controller/caching/fragments.rb
- M actionpack/lib/action_controller/legacy/layout.rb
- M actionpack/lib/action_controller/metal/conditional_get.rb
- M actionpack/lib/action_controller/metal/layouts.rb
- M actionpack/lib/action_controller/metal/mime_responds.rb
- M actionpack/lib/action_controller/metal/render_options.rb
- M actionpack/lib/action_controller/metal/streaming.rb
- M actionpack/lib/action_controller/metal/verification.rb
- M actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb
- M actionpack/lib/action_view/base.rb
- M actionpack/lib/action_view/helpers/active_model_helper.rb
- M actionpack/lib/action_view/helpers/form_tag_helper.rb
- M actionpack/lib/action_view/helpers/number_helper.rb
- M actionpack/lib/action_view/paths.rb
- M actionpack/lib/action_view/render/partials.rb
- M actionpack/lib/action_view/render/rendering.rb
- M actionpack/lib/action_view/template/resolver.rb
- M actionpack/test/abstract_controller/abstract_controller_test.rb
- M actionpack/test/abstract_controller/helper_test.rb
- M actionpack/test/abstract_controller/layouts_test.rb
- M actionpack/test/activerecord/polymorphic_routes_test.rb
- M actionpack/test/controller/caching_test.rb
- M actionpack/test/controller/mime_responds_test.rb
- M actionpack/test/controller/render_test.rb
- M actionpack/test/controller/render_xml_test.rb
- M actionpack/test/controller/routing_test.rb
- M actionpack/test/lib/controller/fake_models.rb
- M actionpack/test/template/number_helper_test.rb
- M activerecord/lib/active_record/attribute_methods/read.rb
- M activerecord/lib/active_record/base.rb
- M activerecord/lib/active_record/migration.rb
- M activerecord/test/cases/adapter_test.rb
- M activerecord/test/cases/associations/belongs_to_associations_test.rb
- M activerecord/test/cases/associations/eager_test.rb
- M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
- M activerecord/test/cases/associations/has_many_associations_test.rb
- M activerecord/test/cases/associations/join_model_test.rb
- M activerecord/test/cases/attribute_methods_test.rb
- M activerecord/test/cases/autosave_association_test.rb
- M activerecord/test/cases/base_test.rb
- M activerecord/test/cases/calculations_test.rb
- M activerecord/test/cases/database_statements_test.rb
- M activerecord/test/cases/finder_test.rb
- M activerecord/test/cases/inheritance_test.rb
- M activerecord/test/cases/invalid_date_test.rb
- M activerecord/test/cases/method_scoping_test.rb
- M activerecord/test/cases/migration_test.rb
- M activerecord/test/cases/named_scope_test.rb
- M activerecord/test/cases/nested_attributes_test.rb
- M activerecord/test/cases/query_cache_test.rb
- M activerecord/test/cases/schema_dumper_test.rb
- M activerecord/test/cases/validations/association_validation_test.rb
- M activerecord/test/connections/native_oracle/connection.rb
- M activerecord/test/models/company.rb
- M activerecord/test/models/subject.rb
- M activerecord/test/schema/oracle_specific_schema.rb
- M activerecord/test/schema/schema.rb
- M activeresource/lib/active_resource/connection.rb
- M activesupport/lib/active_support/json/backends/yaml.rb
- M activesupport/test/json/decoding_test.rb
- M railties/lib/generators.rb
- M railties/lib/generators/active_record.rb
- M railties/lib/generators/named_base.rb
- M railties/lib/generators/rails/app/app_generator.rb
- M railties/lib/tasks/databases.rake
- M railties/lib/tasks/routes.rake
- M railties/test/generators/app_generator_test.rb
- M railties/test/generators/generators_test_helper.rb
- M railties/test/generators/scaffold_controller_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>