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 [3940e345aacb67cb95600acda0f01cb8b02112c0] by Aaron Patterson

Revision 3940e345aacb67cb95600acda0f01cb8b02112c0, committed by Aaron Patterson · April 6th, 2011 @ 12:20 AM

Merge branch '3-0-6' into 3-0-stable

  • 3-0-6: bumping version to 3.0.6 updating CHANGELOG updating CHANGELOG for actionpack do not return html safe strings from auto_link bumping to 3.0.6.rc2 Support both conventions for translations for namespaced models. Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns. Bring back i18n_key to avoid regression Revert "Improve testing of cookies in functional tests:" bumping version to 3.0.6.rc1 updating AR changelog https://github.com/rails/rails/commit/3940e345aacb67cb95600acda0f01...

23 changed files

  • M RAILS_VERSION
  • M actionmailer/CHANGELOG
  • M actionmailer/lib/action_mailer/version.rb
  • M actionpack/CHANGELOG
  • M actionpack/lib/action_controller/test_case.rb
  • M actionpack/lib/action_dispatch/testing/test_process.rb
  • M actionpack/lib/action_dispatch/testing/test_request.rb
  • M actionpack/lib/action_pack/version.rb
  • M actionpack/lib/action_view/helpers/text_helper.rb
  • M actionpack/test/dispatch/cookies_test.rb
  • M actionpack/test/dispatch/test_request_test.rb
  • M actionpack/test/template/text_helper_test.rb
  • M activemodel/CHANGELOG
  • M activemodel/lib/active_model/version.rb
  • M activerecord/CHANGELOG
  • M activerecord/lib/active_record/version.rb
  • M activeresource/CHANGELOG
  • M activeresource/lib/active_resource/version.rb
  • M activesupport/CHANGELOG
  • M activesupport/lib/active_support/version.rb
  • M railties/CHANGELOG
  • M railties/lib/rails/version.rb
  • M version.rb