This project is archived and is in readonly mode.

Changeset [00a9d4b91cccdd88146cbe716eca844dcdfa08e7] by Yehuda Katz + Carl Lerche

May 12th, 2009 @ 01:07 AM

Merge branch 'master' into wip_abstract_controller

Conflicts:

actionpack/lib/action_controller/abstract/callbacks.rb
actionpack/lib/action_controller/abstract/renderer.rb
actionpack/lib/action_controller/base/base.rb
actionpack/lib/action_controller/dispatch/dispatcher.rb
actionpack/lib/action_controller/routing/route_set.rb
actionpack/lib/action_controller/testing/process.rb
actionpack/test/abstract_controller/layouts_test.rb
actionpack/test/controller/filters_test.rb
actionpack/test/controller/helper_test.rb
actionpack/test/controller/render_test.rb
actionpack/test/new_base/test_helper.rb

http://github.com/rails/rails/co...

Committed by Yehuda Katz + Carl Lerche

  • M actionpack/lib/action_controller.rb
  • M actionpack/lib/action_controller/abstract/callbacks.rb
  • M actionpack/lib/action_controller/abstract/helpers.rb
  • M actionpack/lib/action_controller/abstract/layouts.rb
  • M actionpack/lib/action_controller/abstract/logger.rb
  • M actionpack/lib/action_controller/abstract/renderer.rb
  • M actionpack/lib/action_controller/base/base.rb
  • M actionpack/lib/action_controller/base/redirect.rb
  • M actionpack/lib/action_controller/base/rescue.rb
  • M actionpack/lib/action_controller/dispatch/dispatcher.rb
  • M actionpack/lib/action_controller/dispatch/middlewares.rb
  • M actionpack/lib/action_controller/dispatch/rescue.rb
  • M actionpack/lib/action_controller/dispatch/templates/rescues/_request_and_response.erb
  • M actionpack/lib/action_controller/dispatch/templates/rescues/_trace.erb
  • M actionpack/lib/action_controller/dispatch/templates/rescues/diagnostics.erb
  • M actionpack/lib/action_controller/dispatch/templates/rescues/layout.erb
  • M actionpack/lib/action_controller/dispatch/templates/rescues/missing_template.erb
  • M actionpack/lib/action_controller/dispatch/templates/rescues/routing_error.erb
  • M actionpack/lib/action_controller/dispatch/templates/rescues/template_error.erb
  • M actionpack/lib/action_controller/dispatch/templates/rescues/unknown_action.erb
  • M actionpack/lib/action_controller/new_base/base.rb
  • M actionpack/lib/action_controller/new_base/compatibility.rb
  • M actionpack/lib/action_controller/new_base/hide_actions.rb
  • M actionpack/lib/action_controller/new_base/layouts.rb
  • M actionpack/lib/action_controller/new_base/renderer.rb
  • M actionpack/lib/action_controller/testing/integration.rb
  • M actionpack/lib/action_controller/testing/process.rb
  • M actionpack/lib/action_dispatch.rb
  • M actionpack/lib/action_dispatch/http/response.rb
  • M actionpack/lib/action_dispatch/middleware/reloader.rb
  • M actionpack/lib/action_dispatch/middleware/rescue.rb
  • M actionpack/lib/action_dispatch/middleware/show_exceptions.rb
  • M actionpack/lib/action_dispatch/middleware/stack.rb
  • M actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
  • M actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb
  • M actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
  • M actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
  • M actionpack/lib/action_dispatch/middleware/templates/rescues/missing_template.erb
  • M actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
  • M actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb
  • M actionpack/lib/action_dispatch/middleware/templates/rescues/unknown_action.erb
  • M actionpack/lib/action_dispatch/testing/assertions/response.rb
  • M actionpack/lib/action_dispatch/testing/test_request.rb
  • M actionpack/lib/action_dispatch/testing/test_response.rb
  • M actionpack/lib/action_view/paths.rb
  • M actionpack/test/abstract_controller/abstract_controller_test.rb
  • M actionpack/test/abstract_controller/callbacks_test.rb
  • M actionpack/test/abstract_controller/helper_test.rb
  • M actionpack/test/abstract_controller/layouts_test.rb
  • M actionpack/test/abstract_controller/test_helper.rb
  • M actionpack/test/controller/action_pack_assertions_test.rb
  • M actionpack/test/controller/base_test.rb
  • M actionpack/test/controller/caching_test.rb
  • M actionpack/test/controller/cookie_test.rb
  • M actionpack/test/controller/deprecation/deprecated_base_methods_test.rb
  • M actionpack/test/controller/dispatcher_test.rb
  • M actionpack/test/controller/filters_test.rb
  • M actionpack/test/controller/layout_test.rb
  • M actionpack/test/controller/redirect_test.rb
  • M actionpack/test/controller/render_test.rb
  • M actionpack/test/controller/rescue_test.rb
  • M actionpack/test/controller/send_file_test.rb
  • M actionpack/test/controller/test_test.rb
  • M actionpack/test/dispatch/show_exceptions_test.rb
  • M actionpack/test/template/body_parts_test.rb
  • M actionpack/test/template/output_buffer_test.rb
  • M activemodel/lib/active_model/core.rb
  • M activerecord/lib/active_record.rb
  • M activerecord/lib/active_record/association_preload.rb
  • M activerecord/lib/active_record/associations.rb
  • M activerecord/lib/active_record/associations/association_collection.rb
  • M activerecord/lib/active_record/associations/association_proxy.rb
  • M activerecord/lib/active_record/associations/belongs_to_association.rb
  • M activerecord/lib/active_record/associations/has_many_association.rb
  • M activerecord/lib/active_record/associations/has_many_through_association.rb
  • M activerecord/lib/active_record/associations/has_one_association.rb
  • M activerecord/lib/active_record/nested_attributes.rb
  • M activerecord/lib/active_record/reflection.rb
  • M activerecord/test/cases/associations/eager_test.rb
  • M activerecord/test/cases/associations/has_one_associations_test.rb
  • M activerecord/test/cases/associations/inverse_associations_test.rb
  • M activerecord/test/cases/nested_attributes_test.rb
  • M activerecord/test/fixtures/faces.yml
  • M activerecord/test/fixtures/interests.yml
  • M activerecord/test/fixtures/men.yml
  • M activerecord/test/fixtures/organizations.yml
  • M activerecord/test/fixtures/sponsors.yml
  • M activerecord/test/fixtures/zines.yml
  • M activerecord/test/models/face.rb
  • M activerecord/test/models/interest.rb
  • M activerecord/test/models/man.rb
  • M activerecord/test/models/organization.rb
  • M activerecord/test/models/pirate.rb
  • M activerecord/test/models/zine.rb
  • M activerecord/test/schema/schema.rb
  • M activeresource/Rakefile
  • M activeresource/lib/active_resource.rb
  • M activeresource/lib/active_resource/base.rb
  • M activeresource/lib/active_resource/connection.rb
  • M activeresource/lib/active_resource/custom_methods.rb
  • M activeresource/lib/active_resource/exceptions.rb
  • M activeresource/lib/active_resource/formats.rb
  • M activeresource/lib/active_resource/formats/xml_format.rb
  • M activeresource/lib/active_resource/http_mock.rb
  • M activeresource/lib/active_resource/validations.rb
  • M activeresource/test/abstract_unit.rb
  • M activeresource/test/base/load_test.rb
  • M activeresource/test/base_test.rb
  • M activesupport/CHANGELOG
  • M activesupport/lib/active_support.rb
  • M activesupport/lib/active_support/core_ext/date/calculations.rb
  • M activesupport/lib/active_support/core_ext/date_time/conversions.rb
  • M activesupport/lib/active_support/core_ext/hash/conversions.rb
  • M activesupport/lib/active_support/core_ext/module.rb
  • M activesupport/lib/active_support/core_ext/module/setup.rb
  • M activesupport/lib/active_support/core_ext/time/conversions.rb
  • M activesupport/lib/active_support/dependency_module.rb
  • M activesupport/lib/active_support/ordered_hash.rb
  • M activesupport/lib/active_support/values/time_zone.rb
  • M activesupport/test/core_ext/hash_ext_test.rb
  • M activesupport/test/dependency_module_test.rb
  • M activesupport/test/ordered_hash_test.rb
  • M railties/CHANGELOG
  • M railties/Rakefile
  • M railties/configs/seeds.rb
  • M railties/lib/console_app.rb
  • M railties/lib/initializer.rb
  • M railties/lib/rails/rack/metal.rb
  • M railties/lib/rails_generator/generators/applications/app/app_generator.rb
  • M railties/lib/tasks/databases.rake
  • M railties/lib/tasks/gems.rake
  • M tools/profile_requires.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>