Browse files

Merge 3.0.1 CHANGELOGs and prepare 3.0.2.pre

  • Loading branch information...
1 parent 141cba8 commit 14b33a4eb73231523da0c4af6095412ffdacfed1 @spastorino spastorino committed Oct 18, 2010
View
2 RAILS_VERSION
@@ -1 +1 @@
-3.0.1.pre
+3.0.2.pre
View
5 actionmailer/CHANGELOG
@@ -1,7 +1,10 @@
-*Rails 3.0.1 (unreleased)*
+*Rails 3.0.2 (unreleased)*
* No changes
+*Rails 3.0.1 (October 15, 2010)*
+
+* No Changes, just a version bump.
*Rails 3.0.0 (August 29, 2010)*
View
2 actionmailer/lib/action_mailer/version.rb
@@ -2,7 +2,7 @@ module ActionMailer
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 1
+ TINY = 2
BUILD = 'pre'
STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
View
5 actionpack/CHANGELOG
@@ -1,7 +1,10 @@
-*Rails 3.0.1 (unreleased)*
+*Rails 3.0.2 (unreleased)*
* No changes
+*Rails 3.0.1 (October 15, 2010)*
+
+* No Changes, just a version bump.
*Rails 3.0.0 (August 29, 2010)*
View
2 actionpack/lib/action_pack/version.rb
@@ -2,7 +2,7 @@ module ActionPack
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 1
+ TINY = 2
BUILD = 'pre'
STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
View
5 activemodel/CHANGELOG
@@ -1,7 +1,10 @@
-*Rails 3.0.1 (unreleased)*
+*Rails 3.0.2 (unreleased)*
* No changes
+*Rails 3.0.1 (October 15, 2010)*
+
+* No Changes, just a version bump.
*Rails 3.0.0 (August 29, 2010)*
View
2 activemodel/lib/active_model/version.rb
@@ -2,7 +2,7 @@ module ActiveModel
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 1
+ TINY = 2
BUILD = 'pre'
STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
View
6 activerecord/CHANGELOG
@@ -1,4 +1,4 @@
-*Rails 3.0.1 (unreleased)*
+*Rails 3.0.2 (unreleased)*
* reorder is deprecated in favor of except(:order).order(...) [Santiago Pastorino]
@@ -27,6 +27,10 @@
[Aaron Patterson]
+*Rails 3.0.1 (October 15, 2010)*
+
+* Introduce a fix for CVE-2010-3993
+
*Rails 3.0.0 (August 29, 2010)*
* Changed update_attribute to not run callbacks and update the record directly in the database [Neeraj Singh]
View
5 activeresource/CHANGELOG
@@ -1,7 +1,10 @@
-*Rails 3.0.1 (unreleased)*
+*Rails 3.0.2 (unreleased)*
* No changes
+*Rails 3.0.1 (October 15, 2010)*
+
+* No Changes, just a version bump.
*Rails 3.0.0 (August 29, 2010)*
View
2 activeresource/lib/active_resource/version.rb
@@ -2,7 +2,7 @@ module ActiveResource
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 1
+ TINY = 2
BUILD = 'pre'
STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
View
5 activesupport/CHANGELOG
@@ -1,7 +1,10 @@
-*Rails 3.0.1 (unreleased)*
+*Rails 3.0.2 (unreleased)*
* Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! [Andrew White]
+*Rails 3.0.1 (October 15, 2010)*
+
+* No Changes, just a version bump.
*Rails 3.0.0 (August 29, 2010)*
View
2 activesupport/lib/active_support/version.rb
@@ -2,7 +2,7 @@ module ActiveSupport
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 1
+ TINY = 2
BUILD = 'pre'
STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
View
5 railties/CHANGELOG
@@ -1,7 +1,10 @@
-*Rails 3.0.1 (unreleased)*
+*Rails 3.0.2 (unreleased)*
* No changes
+*Rails 3.0.1 (October 15, 2010)*
+
+* No Changes, just a version bump.
*Rails 3.0.0 (August 29, 2010)*
View
2 railties/lib/rails/version.rb
@@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 1
+ TINY = 2
BUILD = 'pre'
STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
View
4 version.rb
@@ -2,9 +2,9 @@ module Rails
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = 1
+ TINY = 2
BUILD = 'pre'
- STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
+ STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
end
end

0 comments on commit 14b33a4

Please sign in to comment.