Permalink
Browse files

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 36691ac 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 a3639be.
  Remove unnecessary code from define_read_method and add assertion to make sure the underscored version is actually generated

Conflicts:
	activerecord/CHANGELOG
  • Loading branch information...
2 parents c6c46e1 + 2c32601 commit 9382cb468e2743693374986f59a53c0740964642 @tenderlove tenderlove committed Apr 18, 2011
View
@@ -1 +1 @@
-3.0.7.rc1
+3.0.7
View
@@ -1,6 +1,6 @@
-*Rails 3.0.7 (unreleased)*
+*Rails 3.0.7 (April 18, 2011)*
-*No changes.
+* remove AM delegating register_observer and register_interceptor to Mail [Josh Kalderimis]
*Rails 3.0.6 (April 5, 2011)
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
TINY = 7
- PRE = "rc1"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end
View
@@ -1,4 +1,4 @@
-*Rails 3.0.7 (unreleased)*
+*Rails 3.0.7 (April 18, 2011)*
*No changes.
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
TINY = 7
- PRE = "rc1"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end
View
@@ -1,4 +1,4 @@
-*Rails 3.0.7 (unreleased)*
+*Rails 3.0.7 (April 18, 2011)*
*No changes.
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
TINY = 7
- PRE = "rc1"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end
View
@@ -3,7 +3,21 @@
* Fix various problems with using :primary_key and :foreign_key options in conjunction with
:through associations. [Jon Leighton]
-*Rails 3.0.7 (unreleased)*
+*Rails 3.0.7 (April 18, 2011)*
+
+* Destroying records via nested attributes works independent of reject_if LH #6006 [Durran Jordan]
+
+* Delegate any? and many? to Model.scoped for consistency [Andrew White]
+
+* Quote the ORDER BY clause in batched finds - fixes #6620 [Andrew White]
+
+* Change exists? so records are not instantiated - fixes #6127. This prevents after_find
+ and after_initialize callbacks being triggered when checking for record existence.
+ [Andrew White]
+
+* Fix performance bug with attribute accessors which only occurred on Ruby 1.8.7, and ensure we
+ cache type-casted values when the column returned from the db contains non-standard chars.
+ [Jon Leighton]
* Fix performance bug with attribute accessors which only occurred on Ruby 1.8.7, and ensure we
cache type-casted values when the column returned from the db contains non-standard chars.
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
TINY = 7
- PRE = "rc1"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end
View
@@ -1,4 +1,4 @@
-*Rails 3.0.7 (unreleased)*
+*Rails 3.0.7 (April 18, 2011)*
*No changes.
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
TINY = 7
- PRE = "rc1"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end
View
@@ -1,4 +1,4 @@
-*Rails 3.0.7 (unreleased)*
+*Rails 3.0.7 (April 18, 2011)*
* Hash.from_xml no longer loses attributes on tags containing only whitespace [André Arko]
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
TINY = 7
- PRE = "rc1"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end
View
@@ -1,4 +1,4 @@
-*Rails 3.0.7 (unreleased)*
+*Rails 3.0.7 (April 18, 2011)*
*No changes.
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
TINY = 7
- PRE = "rc1"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end
View
@@ -61,6 +61,19 @@
end
end
+namespace :changelog do
+ task :release_date do
+ FRAMEWORKS.each do |fw|
+ require 'date'
+ replace = '\1(' + Date.today.strftime('%B %d, %Y') + ')'
+ fname = File.join fw, 'CHANGELOG'
+
+ contents = File.read(fname).sub(/^([^(]*)\(unreleased\)/, replace)
+ File.open(fname, 'wb') { |f| f.write contents }
+ end
+ end
+end
+
namespace :all do
task :build => FRAMEWORKS.map { |f| "#{f}:build" } + ['rails:build']
task :install => FRAMEWORKS.map { |f| "#{f}:install" } + ['rails:install']
View
@@ -3,7 +3,7 @@ module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
TINY = 7
- PRE = "rc1"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end

0 comments on commit 9382cb4

Please sign in to comment.