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.

Changeset [f915f9e33903ee474920e24ad12a1625f2ef1c52] by José Valim

Revision f915f9e33903ee474920e24ad12a1625f2ef1c52, committed by José Valim · January 23rd, 2010 @ 09:53 PM

Merge branch 'master' into app

Conflicts:

railties/lib/rails/application.rb

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

48 changed files

  • R activerecord/lib/active_record/attributes.rb
  • R activerecord/lib/active_record/attributes/aliasing.rb
  • R activerecord/lib/active_record/attributes/store.rb
  • R activerecord/lib/active_record/attributes/typecasting.rb
  • R activerecord/lib/active_record/types.rb
  • R activerecord/lib/active_record/types/number.rb
  • R activerecord/lib/active_record/types/object.rb
  • R activerecord/lib/active_record/types/serialize.rb
  • R activerecord/lib/active_record/types/time_with_zone.rb
  • R activerecord/lib/active_record/types/unknown.rb
  • R activerecord/test/cases/attributes/aliasing_test.rb
  • R activerecord/test/cases/attributes/typecasting_test.rb
  • R activerecord/test/cases/types/number_test.rb
  • R activerecord/test/cases/types/object_test.rb
  • R activerecord/test/cases/types/serialize_test.rb
  • R activerecord/test/cases/types/time_with_zone_test.rb
  • R activerecord/test/cases/types/unknown_test.rb
  • R activerecord/test/cases/types_test.rb
  • M actionpack/lib/abstract_controller/rendering.rb
  • M actionpack/lib/action_controller/base.rb
  • M actionpack/lib/action_controller/metal/rendering.rb
  • M actionpack/lib/action_view/base.rb
  • M actionpack/lib/action_view/helpers/asset_tag_helper.rb
  • M actionpack/lib/action_view/helpers/cache_helper.rb
  • M actionpack/lib/action_view/helpers/url_helper.rb
  • M actionpack/lib/action_view/render/rendering.rb
  • M actionpack/test/abstract/render_test.rb
  • M activerecord/lib/active_record.rb
  • M activerecord/lib/active_record/attribute_methods/before_type_cast.rb
  • M activerecord/lib/active_record/attribute_methods/query.rb
  • M activerecord/lib/active_record/attribute_methods/read.rb
  • M activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
  • M activerecord/lib/active_record/attribute_methods/write.rb
  • M activerecord/lib/active_record/base.rb
  • M activerecord/lib/active_record/relation.rb
  • M activerecord/lib/active_record/relation/query_methods.rb
  • M activerecord/test/cases/method_scoping_test.rb
  • M activerecord/test/cases/named_scope_test.rb
  • M activerecord/test/cases/relations_test.rb
  • M activerecord/test/models/post.rb
  • M railties/lib/generators/rails/app/templates/config.ru
  • M railties/lib/generators/rails/app/templates/db/seeds.rb
  • M railties/lib/generators/rails/app/templates/script/console.tt
  • M railties/lib/generators/rails/app/templates/script/dbconsole.tt
  • M railties/lib/generators/rails/metal/templates/metal.rb
  • M railties/lib/generators/rails/plugin/templates/Rakefile.tt
  • M railties/test/application/middleware_test.rb
  • M railties/test/generators/plugin_generator_test.rb