Lighthouse has a new layout. Prefer the old one? Return to the old layout, and switch back any time from the link at the top of each page.

This project is archived and is in readonly mode.

All changesets

Changeset [a04dedd5634cbb602cf48938cee0ff11c046b4c2] by Emilio Tagua

Revision a04dedd5634cbb602cf48938cee0ff11c046b4c2, committed by Emilio Tagua · May 18th, 2009 @ 03:18 PM

Merge commit 'rails/master'

Conflicts:

activerecord/lib/active_record/base.rb
activerecord/lib/active_record/migration.rb
activerecord/test/cases/helper.rb

http://github.com/rails/rails/commit/a04dedd5634cbb602cf48938cee0ff...

176 changed files

  • A actionpack/examples/minimal.rb
  • A actionpack/lib/action_controller/new_base/redirector.rb
  • A actionpack/lib/action_controller/new_base/rescuable.rb
  • A actionpack/lib/action_dispatch/middleware/callbacks.rb
  • A actionpack/test/controller/render_js_test.rb
  • A actionpack/test/controller/render_json_test.rb
  • A actionpack/test/controller/render_other_test.rb
  • A actionpack/test/controller/render_xml_test.rb
  • A actionpack/test/new_base/redirect_test.rb
  • A actionpack/test/new_base/render_file_test.rb
  • A actionpack/test/new_base/render_partial_test.rb
  • A actionpack/test/new_base/render_xml_test.rb
  • A activerecord/examples/simple.rb
  • A activeresource/examples/simple.rb
  • A tools/profile_requires
  • R actionpack/lib/action_dispatch/middleware/failsafe.rb
  • R activerecord/lib/active_record/i18n_interpolation_deprecation.rb
  • R activerecord/test/cases/aaa_create_tables_test.rb
  • R activerecord/test/schema/schema2.rb
  • R tools/profile_requires.rb
  • M Rakefile
  • M actionmailer/Rakefile
  • M actionmailer/lib/action_mailer/vendor/tmail.rb
  • M actionpack/CHANGELOG
  • M actionpack/Rakefile
  • M actionpack/lib/action_controller.rb
  • M actionpack/lib/action_controller/abstract.rb
  • M actionpack/lib/action_controller/abstract/base.rb
  • M actionpack/lib/action_controller/abstract/callbacks.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/chained/benchmarking.rb
  • M actionpack/lib/action_controller/base/chained/filters.rb
  • M actionpack/lib/action_controller/base/http_authentication.rb
  • M actionpack/lib/action_controller/base/layout.rb
  • M actionpack/lib/action_controller/base/redirect.rb
  • M actionpack/lib/action_controller/dispatch/dispatcher.rb
  • M actionpack/lib/action_controller/dispatch/middlewares.rb
  • M actionpack/lib/action_controller/new_base.rb
  • 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/http.rb
  • M actionpack/lib/action_controller/new_base/layouts.rb
  • M actionpack/lib/action_controller/new_base/renderer.rb
  • M actionpack/lib/action_controller/new_base/testing.rb
  • M actionpack/lib/action_controller/record_identifier.rb
  • M actionpack/lib/action_controller/routing.rb
  • M actionpack/lib/action_controller/routing/builder.rb
  • M actionpack/lib/action_controller/routing/route.rb
  • M actionpack/lib/action_controller/testing/process.rb
  • M actionpack/lib/action_controller/testing/process2.rb
  • M actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
  • M actionpack/lib/action_dispatch.rb
  • M actionpack/lib/action_dispatch/http/mime_type.rb
  • M actionpack/lib/action_dispatch/http/request.rb
  • M actionpack/lib/action_dispatch/http/response.rb
  • M actionpack/lib/action_dispatch/http/status_codes.rb
  • M actionpack/lib/action_dispatch/middleware/params_parser.rb
  • M actionpack/lib/action_dispatch/middleware/show_exceptions.rb
  • M actionpack/lib/action_view.rb
  • M actionpack/lib/action_view/base.rb
  • M actionpack/lib/action_view/helpers/form_helper.rb
  • M actionpack/lib/action_view/helpers/form_options_helper.rb
  • M actionpack/lib/action_view/helpers/number_helper.rb
  • M actionpack/lib/action_view/helpers/tag_helper.rb
  • M actionpack/lib/action_view/helpers/text_helper.rb
  • M actionpack/lib/action_view/render/partials.rb
  • M actionpack/lib/action_view/render/rendering.rb
  • M actionpack/lib/action_view/template/handlers.rb
  • M actionpack/lib/action_view/template/handlers/erb.rb
  • M actionpack/test/abstract_controller/abstract_controller_test.rb
  • M actionpack/test/abstract_controller/callbacks_test.rb
  • M actionpack/test/abstract_controller/test_helper.rb
  • M actionpack/test/abstract_unit.rb
  • M actionpack/test/abstract_unit2.rb
  • M actionpack/test/activerecord/active_record_store_test.rb
  • M actionpack/test/activerecord/polymorphic_routes_test.rb
  • M actionpack/test/controller/action_pack_assertions_test.rb
  • M actionpack/test/controller/addresses_render_test.rb
  • M actionpack/test/controller/base_test.rb
  • M actionpack/test/controller/capture_test.rb
  • M actionpack/test/controller/dispatcher_test.rb
  • M actionpack/test/controller/filters_test.rb
  • M actionpack/test/controller/helper_test.rb
  • M actionpack/test/controller/render_test.rb
  • M actionpack/test/controller/rescue_test.rb
  • M actionpack/test/dispatch/show_exceptions_test.rb
  • M actionpack/test/new_base/render_action_test.rb
  • M actionpack/test/new_base/render_layout_test.rb
  • M actionpack/test/new_base/render_template_test.rb
  • M actionpack/test/new_base/render_test.rb
  • M actionpack/test/new_base/test_helper.rb
  • M actionpack/test/template/form_options_helper_test.rb
  • M actionpack/test/template/number_helper_test.rb
  • M actionpack/test/template/text_helper_test.rb
  • M activemodel/Rakefile
  • M activemodel/test/state_machine/event_test.rb
  • M activemodel/test/state_machine/state_transition_test.rb
  • M activerecord/CHANGELOG
  • M activerecord/Rakefile
  • M activerecord/lib/active_record.rb
  • M activerecord/lib/active_record/associations.rb
  • M activerecord/lib/active_record/associations/association_collection.rb
  • M activerecord/lib/active_record/associations/has_one_through_association.rb
  • M activerecord/lib/active_record/attribute_methods.rb
  • M activerecord/lib/active_record/base.rb
  • M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
  • M activerecord/lib/active_record/connection_adapters/abstract/quoting.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/sqlite3_adapter.rb
  • M activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
  • M activerecord/lib/active_record/dirty.rb
  • M activerecord/lib/active_record/fixtures.rb
  • M activerecord/lib/active_record/migration.rb
  • M activerecord/lib/active_record/named_scope.rb
  • M activerecord/lib/active_record/nested_attributes.rb
  • M activerecord/lib/active_record/schema_dumper.rb
  • M activerecord/lib/active_record/serialization.rb
  • M activerecord/lib/active_record/serializers/xml_serializer.rb
  • M activerecord/lib/active_record/session_store.rb
  • M activerecord/lib/active_record/validations.rb
  • M activerecord/test/cases/aggregations_test.rb
  • M activerecord/test/cases/associations/eager_load_nested_include_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/has_one_through_associations_test.rb
  • M activerecord/test/cases/base_test.rb
  • M activerecord/test/cases/finder_test.rb
  • M activerecord/test/cases/helper.rb
  • M activerecord/test/cases/named_scope_test.rb
  • M activerecord/test/cases/nested_attributes_test.rb
  • M activerecord/test/cases/validations_i18n_test.rb
  • M activerecord/test/fixtures/people.yml
  • M activerecord/test/models/company_in_module.rb
  • M activerecord/test/models/person.rb
  • M activerecord/test/schema/schema.rb
  • M activeresource/Rakefile
  • M activeresource/lib/active_resource/base.rb
  • M activeresource/test/base/custom_methods_test.rb
  • M activeresource/test/base/load_test.rb
  • M activeresource/test/base_test.rb
  • M activesupport/Rakefile
  • M activesupport/lib/active_support/core_ext/object/conversions.rb
  • M activesupport/lib/active_support/json.rb
  • M activesupport/lib/active_support/json/backends/jsongem.rb
  • M activesupport/lib/active_support/json/backends/yaml.rb
  • M activesupport/lib/active_support/memoizable.rb
  • M activesupport/lib/active_support/xml_mini/jdom.rb
  • M activesupport/lib/active_support/xml_mini/libxml.rb
  • M activesupport/lib/active_support/xml_mini/nokogiri.rb
  • M activesupport/lib/active_support/xml_mini/rexml.rb
  • M activesupport/test/json/decoding_test.rb
  • M activesupport/test/xml_mini/nokogiri_engine_test.rb
  • M activesupport/test/xml_mini/rexml_engine_test.rb
  • M railties/Rakefile
  • M railties/builtin/rails_info/rails/info.rb
  • M railties/configs/routes.rb
  • M railties/lib/commands/performance/profiler.rb
  • M railties/lib/console_app.rb
  • M railties/lib/initializer.rb
  • M railties/lib/rails/plugin.rb
  • M railties/lib/rails/plugin/loader.rb
  • M railties/lib/rails/plugin/locator.rb
  • M railties/lib/rails_generator/generators/applications/app/template_runner.rb
  • M railties/lib/rails_generator/generators/components/model/templates/model.rb
  • M railties/lib/rails_generator/scripts.rb
  • M railties/lib/tasks/gems.rake
  • M railties/test/abstract_unit.rb
  • M railties/test/plugin_test_helper.rb
  • M railties/test/rails_info_test.rb