This project is archived and is in readonly mode.

Changeset [9382cb468e2743693374986f59a53c0740964642] by Aaron Patterson

April 18th, 2011 @ 10:05 PM

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

  • 3-0-7: bumping version for release adding a rake task to update CHANGELOG dates Prepare for the 3.0.7.rc2 release Added missing CHANGELOG entries for 3.0.7 Add missing CHANGELOG entries Update CHANGELOG Backport test assertions from 65469a6 (the behaviour is already the same, but we need to assertions to guard against regressions) Undo performances regressions I introduced in 36691ac9fc932cc11c59c42c7f388399f1e51f54 and add test for an edge case. Add comments to explain the intent of the code. Also fix the code (which previously worked differently on 1.8 and 1.9 due to Symbol#=~ being always false on 1.8)." Return nil from read_attribute if _foo is defined, but @attributes has no 'foo' key. Fixes breakage in test_find_only_some_columns on Ruby 1.9 which was introduced in a3639be4ed5e89b59c4ad0154d44f58e3e48d484. Remove unnecessary code from define_read_method and add assertion to make sure the underscored version is actually generated

Conflicts:

activerecord/CHANGELOG

https://github.com/rails/rails/commit/9382cb468e2743693374986f59a53...

Committed by Aaron Patterson

  • M RAILS_VERSION
  • M actionmailer/CHANGELOG
  • M actionmailer/lib/action_mailer/version.rb
  • M actionpack/CHANGELOG
  • M actionpack/lib/action_pack/version.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 tasks/release.rb
  • M version.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>